move logic out of txbrowser ui into parent

src/app/debugger/debuggerUI.js

@@ -4,6 +4,7 @@ var SourceHighlighter = require('../editor/sourceHighlighter')
 var TxBrowser = require('./debuggerUI/TxBrowser')
 var remixLib = require('remix-lib')
 var executionContext = remixLib.execution.executionContext
+var traceHelper = remixLib.helpers.trace
 
 class DebuggerUI {
 
@@ -39,16 +40,45 @@ class DebuggerUI {
 
   startTxBrowser () {
     const self = this
+    let web3 = executionContext.web3()
 
-    let txBrowser = new TxBrowser(this.debugger_ui, {web3: executionContext.web3()})
+    let txBrowser = new TxBrowser(this.debugger_ui, {web3: web3})
     this.debugger_ui.txBrowser = txBrowser
 
-    txBrowser.event.register('newTxLoading', this, function () {
+    txBrowser.event.register('requestDebug', function (blockNumber, txNumber, tx) {
       self.debugger_ui.unLoad()
+
+      if (tx) {
+        if (!tx.to) {
+          tx.to = traceHelper.contractCreationToken('0')
+        }
+        return self.debugger_ui.startDebugging(blockNumber, txNumber, tx)
+      }
+
+      try {
+        if (txNumber.indexOf('0x') !== -1) {
+          return web3.eth.getTransaction(txNumber, function (error, result) {
+            let tx = result
+            txBrowser.update(error, result)
+            self.debugger_ui.startDebugging(blockNumber, txNumber, tx)
+          })
+        }
+        web3.eth.getTransactionFromBlock(blockNumber, txNumber, function (error, result) {
+          let tx = result
+          txBrowser.update(error, result)
+          self.debugger_ui.startDebugging(blockNumber, txNumber, tx)
+        })
+      } catch (e) {
+        self.update(e.message)
+      }
     })
-    txBrowser.event.register('newTraceRequested', this, function (blockNumber, txIndex, tx) {
+
-      self.debugger_ui.startDebugging(blockNumber, txIndex, tx)
+    // txBrowser.event.register('newTxLoading', this, function () {
-    })
+    //   self.debugger_ui.unLoad()
+    // })
+    // txBrowser.event.register('newTraceRequested', this, function (blockNumber, txIndex, tx) {
+    //   self.debugger_ui.startDebugging(blockNumber, txIndex, tx)
+    // })
     txBrowser.event.register('unloadRequested', this, function (blockNumber, txIndex, tx) {
       self.debugger_ui.unLoad()
     })

src/app/debugger/debuggerUI/TxBrowser.js

@@ -1,6 +1,5 @@
 var remixLib = require('remix-lib')
 var EventManager = remixLib.EventManager
-var traceHelper = remixLib.helpers.trace
 var yo = require('yo-yo')
 var csjs = require('csjs-inject')
 var styleGuide = require('../../ui/styles-guide/theme-chooser')
@@ -64,27 +63,29 @@ TxBrowser.prototype.setDefaultValues = function () {
 }
 
 TxBrowser.prototype.submit = function (tx) {
-  var self = this
+  this.event.trigger('requestDebug', [this.blockNumber, this.txNumber, tx])
-  self.event.trigger('newTxLoading', [this.blockNumber, this.txNumber])
+
-  if (tx) {
+  // var self = this
-    return self.update(null, tx)
+  // self.event.trigger('newTxLoading', [this.blockNumber, this.txNumber])
-  }
+  // if (tx) {
-  if (!this.txNumber) {
+  //   return self.update(null, tx)
-    self.update('no tx index or tx hash to look for')
+  // }
-    return
+  // if (!this.txNumber) {
-  }
+  //   self.update('no tx index or tx hash to look for')
-  try {
+  //   return
-    if (this.txNumber.indexOf('0x') !== -1) {
+  // }
-      return self.web3.eth.getTransaction(this.txNumber, function (error, result) {
+  // try {
-        self.update(error, result)
+  //   if (this.txNumber.indexOf('0x') !== -1) {
-      })
+  //     return self.web3.eth.getTransaction(this.txNumber, function (error, result) {
-    }
+  //       self.update(error, result)
-    self.web3.eth.getTransactionFromBlock(this.blockNumber, this.txNumber, function (error, result) {
+  //     })
-      self.update(error, result)
+  //   }
-    })
+  //   self.web3.eth.getTransactionFromBlock(this.blockNumber, this.txNumber, function (error, result) {
-  } catch (e) {
+  //     self.update(error, result)
-    self.update(e.message)
+  //   })
-  }
+  // } catch (e) {
+  //   self.update(e.message)
+  // }
 }
 
 TxBrowser.prototype.update = function (error, tx) {
@@ -99,10 +100,7 @@ TxBrowser.prototype.update = function (error, tx) {
   }
 
   this.view.querySelector('#error').innerHTML = ''
-  if (!tx.to) {
+  // this.event.trigger('newTraceRequested', [this.blockNumber, this.txNumber, tx])
-    tx.to = traceHelper.contractCreationToken('0')
-  }
-  this.event.trigger('newTraceRequested', [this.blockNumber, this.txNumber, tx])
 }
 
 TxBrowser.prototype.updateBlockN = function (ev) {