Commit d443252c authored by chriseth's avatar chriseth Committed by GitHub

Merge pull request #289 from ethereum/fixRemix

fix Remix
parents d1acbc34 4c968f55
...@@ -17,6 +17,4 @@ env: ...@@ -17,6 +17,4 @@ env:
- COMMIT_AUTHOR="Travis CI" - COMMIT_AUTHOR="Travis CI"
- PUSH_REPO="git@github.com:ethereum/browser-solidity.git" - PUSH_REPO="git@github.com:ethereum/browser-solidity.git"
- FILES_TO_PACKAGE="assets background.js build icon.png index.html manifest.json README.md soljson.js" - FILES_TO_PACKAGE="assets background.js build icon.png index.html manifest.json README.md soljson.js"
cache: cache: false
directories:
- node_modules
...@@ -24,12 +24,12 @@ function Debugger (id, editor, compiler, executionContextEvent, switchToFile) { ...@@ -24,12 +24,12 @@ function Debugger (id, editor, compiler, executionContextEvent, switchToFile) {
}) })
this.lastCompilationResult = null this.lastCompilationResult = null
this.debugger.register('newTraceLoaded', this, function () { this.debugger.event.register('newTraceLoaded', this, function () {
self.cache.clear() self.cache.clear()
self.lastCompilationResult = self.compiler.lastCompilationResult self.lastCompilationResult = self.compiler.lastCompilationResult
}) })
this.debugger.register('traceUnloaded', this, function () { this.debugger.event.register('traceUnloaded', this, function () {
self.removeCurrentMarker() self.removeCurrentMarker()
self.cache.clear() self.cache.clear()
}) })
...@@ -41,7 +41,7 @@ function Debugger (id, editor, compiler, executionContextEvent, switchToFile) { ...@@ -41,7 +41,7 @@ function Debugger (id, editor, compiler, executionContextEvent, switchToFile) {
}) })
// register selected code item, highlight the corresponding source location // register selected code item, highlight the corresponding source location
this.debugger.codeManager.register('changed', this, function (code, address, index) { this.debugger.codeManager.event.register('changed', this, function (code, address, index) {
if (self.lastCompilationResult) { if (self.lastCompilationResult) {
this.debugger.sourceLocationTracker.getSourceLocation(address, index, self.lastCompilationResult.data.contracts, function (error, rawLocation) { this.debugger.sourceLocationTracker.getSourceLocation(address, index, self.lastCompilationResult.data.contracts, function (error, rawLocation) {
if (!error) { if (!error) {
......
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