Commit c4649812 authored by yann300's avatar yann300

ethDebuggerSelectedItem as property instead of global var

parent 66576387
...@@ -25,12 +25,12 @@ module.exports = React.createClass({ ...@@ -25,12 +25,12 @@ module.exports = React.createClass({
var self = this var self = this
this.context.root.register('indexChanged', this, function (index) { this.context.root.register('indexChanged', this, function (index) {
if (index < 0) return if (index < 0) return
if (window.ethDebuggerSelectedItem !== index) return if (self.context.root.ethDebuggerSelectedItem !== index) return
self.context.traceManager.getCallDataAt(index, function (error, calldata) { self.context.traceManager.getCallDataAt(index, function (error, calldata) {
if (error) { if (error) {
console.log(error) console.log(error)
} else if (window.ethDebuggerSelectedItem === index) { } else if (self.context.root.ethDebuggerSelectedItem === index) {
self.setState({ self.setState({
data: self.format(calldata) data: self.format(calldata)
}) })
......
...@@ -25,12 +25,12 @@ module.exports = React.createClass({ ...@@ -25,12 +25,12 @@ module.exports = React.createClass({
var self = this var self = this
this.context.root.register('indexChanged', this, function (index) { this.context.root.register('indexChanged', this, function (index) {
if (index < 0) return if (index < 0) return
if (window.ethDebuggerSelectedItem !== index) return if (self.context.root.ethDebuggerSelectedItem !== index) return
self.context.traceManager.getCallStackAt(index, function (error, callstack) { self.context.traceManager.getCallStackAt(index, function (error, callstack) {
if (error) { if (error) {
console.log(error) console.log(error)
} else if (window.ethDebuggerSelectedItem === index) { } else if (self.context.root.ethDebuggerSelectedItem === index) {
self.setState({ self.setState({
data: self.format(callstack) data: self.format(callstack)
}) })
......
...@@ -8,6 +8,8 @@ var util = require('./util') ...@@ -8,6 +8,8 @@ var util = require('./util')
var EventManager = require('./eventManager') var EventManager = require('./eventManager')
module.exports = React.createClass({ module.exports = React.createClass({
ethDebuggerSelectedItem: -1,
getInitialState: function () { getInitialState: function () {
return { return {
currentStepIndex: -1, // index of the selected item in the vmtrace currentStepIndex: -1, // index of the selected item in the vmtrace
......
...@@ -26,12 +26,12 @@ module.exports = React.createClass({ ...@@ -26,12 +26,12 @@ module.exports = React.createClass({
var self = this var self = this
this.context.root.register('indexChanged', this, function (index) { this.context.root.register('indexChanged', this, function (index) {
if (index < 0) return if (index < 0) return
if (window.ethDebuggerSelectedItem !== index) return if (self.context.root.ethDebuggerSelectedItem !== index) return
self.context.traceManager.getMemoryAt(index, function (error, memory) { self.context.traceManager.getMemoryAt(index, function (error, memory) {
if (error) { if (error) {
console.log(error) console.log(error)
} else if (window.ethDebuggerSelectedItem === index) { } else if (self.context.root.ethDebuggerSelectedItem === index) {
self.setState({ self.setState({
data: self.formatMemory(memory, 16) data: self.formatMemory(memory, 16)
}) })
......
...@@ -25,12 +25,12 @@ module.exports = React.createClass({ ...@@ -25,12 +25,12 @@ module.exports = React.createClass({
var self = this var self = this
this.context.root.register('indexChanged', this, function (index) { this.context.root.register('indexChanged', this, function (index) {
if (index < 0) return if (index < 0) return
if (window.ethDebuggerSelectedItem !== index) return if (self.context.root.ethDebuggerSelectedItem !== index) return
self.context.traceManager.getStackAt(index, function (error, stack) { self.context.traceManager.getStackAt(index, function (error, stack) {
if (error) { if (error) {
console.log(error) console.log(error)
} else if (window.ethDebuggerSelectedItem === index) { } else if (self.context.root.ethDebuggerSelectedItem === index) {
self.setState({ self.setState({
data: self.format(stack) data: self.format(stack)
}) })
......
...@@ -50,7 +50,7 @@ module.exports = React.createClass({ ...@@ -50,7 +50,7 @@ module.exports = React.createClass({
}, },
updateGlobalSelectedItem: function (value) { updateGlobalSelectedItem: function (value) {
window.ethDebuggerSelectedItem = value this.context.root.ethDebuggerSelectedItem = value
}, },
init: function () { init: function () {
...@@ -108,7 +108,6 @@ module.exports = React.createClass({ ...@@ -108,7 +108,6 @@ module.exports = React.createClass({
var step = this.context.traceManager.findStepOverForward(this.state.currentStepIndex) var step = this.context.traceManager.findStepOverForward(this.state.currentStepIndex)
this.refs.slider.setValue(step) this.refs.slider.setValue(step)
this.changeState(step) this.changeState(step)
}, },
stepOverBack: function () { stepOverBack: function () {
......
...@@ -26,12 +26,12 @@ module.exports = React.createClass({ ...@@ -26,12 +26,12 @@ module.exports = React.createClass({
var self = this var self = this
this.context.root.register('indexChanged', this, function (index) { this.context.root.register('indexChanged', this, function (index) {
if (index < 0) return if (index < 0) return
if (window.ethDebuggerSelectedItem !== index) return if (self.context.root.ethDebuggerSelectedItem !== index) return
self.context.traceManager.getStorageAt(index, self.context.tx, function (error, storage) { self.context.traceManager.getStorageAt(index, self.context.tx, function (error, storage) {
if (error) { if (error) {
console.log(error) console.log(error)
} else if (window.ethDebuggerSelectedItem === index) { } else if (self.context.root.ethDebuggerSelectedItem === index) {
self.setState({ self.setState({
data: self.formatStorage(storage) data: self.formatStorage(storage)
}) })
......
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