Merge pull request #1367 from ethereum/registry

Add global registry
pull/1/head
yann300 7 years ago committed by GitHub
commit 0f240a6679
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/app.js
  2. 9
      src/app/editor/editor.js
  3. 1
      src/global/registry.js
  4. 11
      src/module-id.js
  5. 24
      src/registry.js

@ -9,6 +9,7 @@ var remixLib = require('remix-lib')
var remixTests = require('remix-tests')
var EventManager = remixLib.EventManager
var registry = require('./global/registry')
var UniversalDApp = require('./universal-dapp.js')
var UniversalDAppUI = require('./universal-dapp-ui.js')
var Remixd = require('./lib/remixd')
@ -293,6 +294,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
// ----------------- Compiler -----------------
var compiler = new Compiler(importFileCb)
registry.put({api: compiler, name: 'compiler'})
var offsetToLineColumnConverter = new OffsetToLineColumnConverter(compiler.event)
// ----------------- UniversalDApp -----------------

@ -65,6 +65,7 @@ document.head.appendChild(yo`
function Editor (opts = {}) {
var self = this
var el = yo`<div id="input"></div>`
var editor = ace.edit(el)
if (styles.appProperties.aceTheme) {
@ -103,14 +104,14 @@ function Editor (opts = {}) {
var breakpoints = e.editor.session.getBreakpoints()
for (var k in breakpoints) {
if (k === row.toString()) {
event.trigger('breakpointCleared', [currentSession, row])
self.event.trigger('breakpointCleared', [currentSession, row])
e.editor.session.clearBreakpoint(row)
e.stop()
return
}
}
self.setBreakpoint(row)
event.trigger('breakpointAdded', [currentSession, row])
self.event.trigger('breakpointAdded', [currentSession, row])
e.stop()
})
@ -277,10 +278,10 @@ function Editor (opts = {}) {
// Do setup on initialisation here
editor.on('changeSession', function () {
event.trigger('sessionSwitched', [])
self.event.trigger('sessionSwitched', [])
editor.getSession().on('change', function () {
event.trigger('contentChanged', [])
self.event.trigger('contentChanged', [])
})
})

@ -0,0 +1 @@
module.exports = new (require('../registry.js'))()

@ -0,0 +1,11 @@
module.exports = stacktrace
/*
Not used yet
*/
function stacktrace () {
var _ = Error.prepareStackTrace
Error.prepareStackTrace = (_, stack) => stack
var callsites = new Error().stack
Error.prepareStackTrace = _
return callsites.slice(2).map(x => { return x.getFunctionName() }).reverse().join('.')
}

@ -0,0 +1,24 @@
// const moduleID = require('./module-id.js')
module.exports = class registry {
constructor () {
this.state = {}
}
put ({ api, name }) {
// const serveruid = moduleID() + '.' + (name || '')
if (this.state[name]) return this.state[name]
const server = {
// uid: serveruid,
api
}
this.state[name] = { server }
return server
}
get (name) {
// const clientuid = moduleID()
const state = this.state[name]
if (!state) return
const server = state.server
return server
}
}
Loading…
Cancel
Save