remove jump next call

pull/7/head
yann300 8 years ago
parent 6f3dba44ed
commit 2ec51c3b62
  1. 7
      src/ui/ButtonNavigator.js
  2. 15
      src/ui/StepManager.js

@ -10,7 +10,6 @@ function ButtonNavigator (_parent, _traceManager) {
this.overBackDisabled = true this.overBackDisabled = true
this.intoForwardDisabled = true this.intoForwardDisabled = true
this.overForwardDisabled = true this.overForwardDisabled = true
this.nextCallDisabled = true
this.jumpOutDisabled = true this.jumpOutDisabled = true
this.traceManager = _traceManager this.traceManager = _traceManager
@ -67,8 +66,6 @@ ButtonNavigator.prototype.render = function () {
</button> </button>
<button id='overforward' title='step over forward' class='fa fa-angle-double-right' style=${ui.formatCss(style.button)} onclick=${function () { self.event.trigger('stepOverForward') }} disabled=${this.overForwardDisabled} > <button id='overforward' title='step over forward' class='fa fa-angle-double-right' style=${ui.formatCss(style.button)} onclick=${function () { self.event.trigger('stepOverForward') }} disabled=${this.overForwardDisabled} >
</button> </button>
<button id='nextcall' title='step next call' class='fa fa-chevron-right' style=${ui.formatCss(style.button)} onclick=${function () { self.event.trigger('jumpNextCall') }} disabled=${this.nextCallDisabled} >
</button>
<button id='jumpout' title='jump out' class='fa fa-share' style=${ui.formatCss(style.button)} onclick=${function () { self.event.trigger('jumpOut') }} disabled=${this.jumpOutDisabled} > <button id='jumpout' title='jump out' class='fa fa-share' style=${ui.formatCss(style.button)} onclick=${function () { self.event.trigger('jumpOut') }} disabled=${this.jumpOutDisabled} >
</button> </button>
<div id='reverted' style="display:none"> <div id='reverted' style="display:none">
@ -90,7 +87,6 @@ ButtonNavigator.prototype.reset = function () {
this.overBackDisabled = true this.overBackDisabled = true
this.intoForwardDisabled = true this.intoForwardDisabled = true
this.overForwardDisabled = true this.overForwardDisabled = true
this.nextCallDisabled = true
this.jumpOutDisabled = true this.jumpOutDisabled = true
resetWarning(this) resetWarning(this)
} }
@ -110,8 +106,6 @@ ButtonNavigator.prototype.stepChanged = function (step) {
} else { } else {
self.intoForwardDisabled = step >= length - 1 self.intoForwardDisabled = step >= length - 1
self.overForwardDisabled = step >= length - 1 self.overForwardDisabled = step >= length - 1
var nextCall = self.traceManager.findNextCall(step)
self.nextCallDisabled = nextCall === step
var stepOut = self.traceManager.findStepOut(step) var stepOut = self.traceManager.findStepOut(step)
self.jumpOutDisabled = stepOut === step self.jumpOutDisabled = stepOut === step
} }
@ -126,7 +120,6 @@ ButtonNavigator.prototype.updateAll = function () {
this.updateDisabled('overback', this.overBackDisabled) this.updateDisabled('overback', this.overBackDisabled)
this.updateDisabled('overforward', this.overForwardDisabled) this.updateDisabled('overforward', this.overForwardDisabled)
this.updateDisabled('intoforward', this.intoForwardDisabled) this.updateDisabled('intoforward', this.intoForwardDisabled)
this.updateDisabled('nextcall', this.nextCallDisabled)
this.updateDisabled('jumpout', this.jumpOutDisabled) this.updateDisabled('jumpout', this.jumpOutDisabled)
this.updateDisabled('jumptoexception', this.jumpOutDisabled) this.updateDisabled('jumptoexception', this.jumpOutDisabled)
} }

@ -54,9 +54,6 @@ function StepManager (_parent, _traceManager) {
this.buttonNavigator.event.register('stepOverForward', this, function () { this.buttonNavigator.event.register('stepOverForward', this, function () {
self.stepOverForward() self.stepOverForward()
}) })
this.buttonNavigator.event.register('jumpNextCall', this, function () {
self.jumpNextCall()
})
this.buttonNavigator.event.register('jumpOut', this, function () { this.buttonNavigator.event.register('jumpOut', this, function () {
self.jumpOut() self.jumpOut()
}) })
@ -171,18 +168,6 @@ StepManager.prototype.stepOverBack = function () {
this.changeState(step) this.changeState(step)
} }
StepManager.prototype.jumpNextCall = function () {
if (!this.traceManager.isLoaded()) {
return
}
var step = this.traceManager.findNextCall(this.currentStepIndex)
if (this.solidityMode) {
step = this.resolveToReducedTrace(step, 0)
}
this.slider.setValue(step)
this.changeState(step)
}
StepManager.prototype.jumpOut = function () { StepManager.prototype.jumpOut = function () {
if (!this.traceManager.isLoaded()) { if (!this.traceManager.isLoaded()) {
return return

Loading…
Cancel
Save