Commit 75f8b3a3 authored by Iuri Matias's avatar Iuri Matias Committed by yann300

refactor unload; remove all direct references to the internal debugger from the UI

parent 8cd4a356
...@@ -139,4 +139,9 @@ Debugger.prototype.debugTx = function (tx, loadingCb) { ...@@ -139,4 +139,9 @@ Debugger.prototype.debugTx = function (tx, loadingCb) {
this.debugger.debug(tx) this.debugger.debug(tx)
} }
Debugger.prototype.unload = function () {
this.debugger.unLoad()
this.event.trigger('debuggerUnloaded')
}
module.exports = Debugger module.exports = Debugger
...@@ -37,7 +37,6 @@ class DebuggerUI { ...@@ -37,7 +37,6 @@ class DebuggerUI {
compiler: this.registry.get('compiler').api compiler: this.registry.get('compiler').api
}) })
this.debugger = this.transactionDebugger.debugger
this.isActive = false this.isActive = false
this.sourceHighlighter = new SourceHighlighter() this.sourceHighlighter = new SourceHighlighter()
...@@ -69,7 +68,7 @@ class DebuggerUI { ...@@ -69,7 +68,7 @@ class DebuggerUI {
// unload if a file has changed (but not if tabs were switched) // unload if a file has changed (but not if tabs were switched)
self.editor.event.register('contentChanged', function () { self.editor.event.register('contentChanged', function () {
self.debugger.unLoad() self.transactionDebugger.unload()
}) })
} }
...@@ -83,6 +82,8 @@ class DebuggerUI { ...@@ -83,6 +82,8 @@ class DebuggerUI {
this.transactionDebugger.event.register('newSourceLocation', function (lineColumnPos, rawLocation) { this.transactionDebugger.event.register('newSourceLocation', function (lineColumnPos, rawLocation) {
self.sourceHighlighter.currentSourceLocation(lineColumnPos, rawLocation) self.sourceHighlighter.currentSourceLocation(lineColumnPos, rawLocation)
}) })
this.transactionDebugger.event.register('debuggerUnloaded', self.unLoad.bind(this))
} }
startTxBrowser () { startTxBrowser () {
...@@ -91,14 +92,12 @@ class DebuggerUI { ...@@ -91,14 +92,12 @@ class DebuggerUI {
this.txBrowser = txBrowser this.txBrowser = txBrowser
txBrowser.event.register('requestDebug', function (blockNumber, txNumber, tx) { txBrowser.event.register('requestDebug', function (blockNumber, txNumber, tx) {
self.debugger.unLoad() self.transactionDebugger.unload()
self.unLoad()
self.startDebugging(blockNumber, txNumber, tx) self.startDebugging(blockNumber, txNumber, tx)
}) })
txBrowser.event.register('unloadRequested', this, function (blockNumber, txIndex, tx) { txBrowser.event.register('unloadRequested', this, function (blockNumber, txIndex, tx) {
self.debugger.unLoad() self.transactionDebugger.unload()
self.unLoad()
}) })
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment