+
${this.txBrowser.render()}
${this.stepManager.render()}
diff --git a/src/ui/TxBrowser.js b/src/ui/TxBrowser.js
index be734871d7..058b80413a 100644
--- a/src/ui/TxBrowser.js
+++ b/src/ui/TxBrowser.js
@@ -34,7 +34,6 @@ function TxBrowser (_parent) {
TxBrowser.prototype.setDefaultValues = function () {
this.blockNumber = null
- this.txNumber = ''
this.connectInfo = ''
this.basicPanel.data = {}
this.basicPanel.update()
diff --git a/src/ui/img/play-arrow.png b/src/ui/img/play-arrow.png
deleted file mode 100644
index 3414a07289..0000000000
Binary files a/src/ui/img/play-arrow.png and /dev/null differ
diff --git a/src/ui/styles/basicStyles.js b/src/ui/styles/basicStyles.js
index eb6c91c5c3..1002aeb7ac 100644
--- a/src/ui/styles/basicStyles.js
+++ b/src/ui/styles/basicStyles.js
@@ -63,12 +63,7 @@ module.exports = {
'-moz-box-shadow': 'inset 0px 1px 0px 0px #ffffff',
'-webkit-box-shadow': 'inset 0px 1px 0px 0px #ffffff',
'box-shadow': 'inset 0px 1px 0px 0px #ffffff',
- 'background': '-webkit-gradient(linear, left top, left bottom, color-stop(0.05, #f9f9f9), color-stop(1, #e9e9e9))', // eslint-disable-line
- 'background': '-moz-linear-gradient(top, #f9f9f9 5%, #e9e9e9 100%)', // eslint-disable-line
- 'background': '-webkit-linear-gradient(top, #f9f9f9 5%, #e9e9e9 100%)', // eslint-disable-line
- 'background': '-o-linear-gradient(top, #f9f9f9 5%, #e9e9e9 100%)', // eslint-disable-line
- 'background': '-ms-linear-gradient(top, #f9f9f9 5%, #e9e9e9 100%)', // eslint-disable-line
- 'background': 'linear-gradient(to bottom, #f9f9f9 5%, #e9e9e9 100%)', // eslint-disable-line
+ '*background': 'background:-webkit-gradient(linear, left top, left bottom, color-stop(0.05, #f9f9f9), color-stop(1, #e9e9e9));background: -moz-linear-gradient(top, #f9f9f9 5%, #e9e9e9 100%);;background: -webkit-linear-gradient(top, #f9f9f9 5%, #e9e9e9 100%);background: -webkit-linear-gradient(top, #f9f9f9 5%, #e9e9e9 100%);background: -webkit-linear-gradient(top, #f9f9f9 5%, #e9e9e9 100%);background: -webkit-linear-gradient(top, #f9f9f9 5%, #e9e9e9 100%);background: -o-linear-gradient(top, #f9f9f9 5%, #e9e9e9 100%);background: -ms-linear-gradient(top, #f9f9f9 5%, #e9e9e9 100%);background: linear-gradient(to bottom, #f9f9f9 5%, #e9e9e9 100%);', // eslint-disable-line
'filter': "progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#e9e9e9',GradientType=0)", // eslint-disable-line
'background-color': '#f9f9f9',
'-moz-border-radius': '6px',
diff --git a/test-browser/init.js b/test-browser/init.js
index b39a74cd25..642c4661dd 100644
--- a/test-browser/init.js
+++ b/test-browser/init.js
@@ -128,31 +128,34 @@ browser.fireEvent = function (el, key, times, callback) {
}
function assertPanel (id, browser, value) {
- var selector = id + ' .dropdownpanel div div'
- browser.execute(function (id) {
- var node = document.querySelector(id)
+ var selector = '.dropdownpanel div.dropdowncontent div'
+ browser.execute(function (id, selector) {
+ var el = document.getElementById(id.replace('#', '').replace('.', ''))
+ var node = el.querySelector(selector)
var ret = []
- for (var k in node.children) {
+ for (var k = 0; k < node.children.length; k++) {
if (node.children[k].innerText) {
ret.push(node.children[k].innerText)
}
}
return ret
- }, [selector], function (returnValues) {
+ }, [id, selector], function (returnValues) {
value.map(function (item, index) {
- browser.assert.equal(returnValues.value[index], value[index])
+ var testValue = returnValues.value[index].replace(/\r\n/g, '').replace(/\t/g, '').replace(/\s/g, '')
+ browser.assert.equal(testValue, value[index])
})
})
return browser
}
function assertPanelValue (id, browser, index, value) {
- var selector = id + ' .dropdownpanel div div'
+ var selector = id + ' .dropdownpanel .dropdowncontent div'
browser.execute(function (id, index) {
var node = document.querySelector(id)
return node.children[index].innerText
}, [selector, index], function (returnValues) {
- browser.assert.equal(returnValues.value, value)
+ var testValue = returnValues.value.replace(/\r\n/g, '').replace(/\t/g, '').replace(/\s/g, '')
+ browser.assert.equal(testValue, value)
})
return browser
}
diff --git a/test-browser/vmdebugger.js b/test-browser/vmdebugger.js
index 8ae1a6999f..861f51098c 100644
--- a/test-browser/vmdebugger.js
+++ b/test-browser/vmdebugger.js
@@ -64,15 +64,15 @@ function panels (browser) {
.assertCallData(['0x60fe47b10000000000000000000000000000000000000000000000000000000000000038'])
.assertCallStack(['0x0d3a18d64dfe4f927832ab58d6451cecc4e517c5'])
.assertStackValue(1, '0x60')
- .assertMemoryValue(6, '0x6060606040526040516020806045833981\t????R??Q????E?9?')
- .assertMemoryValue(7, '0x7001604052808051906020019091905050\t???R??Q???????PP')
- .assertMemoryValue(8, '0x805b806001016000600050819055505b50\t?????????P??UP?P')
+ .assertMemoryValue(6, '0x6060606040526040516020806045833981????R??Q????E?9?')
+ .assertMemoryValue(7, '0x7001604052808051906020019091905050???R??Q???????PP')
+ .assertMemoryValue(8, '0x805b806001016000600050819055505b50?????????P??UP?P')
.click('#intoforward') // CREATE
.assertStack(['Empty'])
.assertStorageChanges(['Empty'])
.assertMemory(['Empty'])
.assertCallData(['0x0000000000000000000000000000000000000000000000000000000000000000000000000000006060606040526040516020806045833981016040528080519060200190919050505b806001016000600050819055'])
- .assertCallStack(['0x0d3a18d64dfe4f927832ab58d6451cecc4e517c5', '(Contract Creation - Step 63)'])
+ .assertCallStack(['0x0d3a18d64dfe4f927832ab58d6451cecc4e517c5', '(ContractCreation-Step63)'])
return browser
}
@@ -160,7 +160,7 @@ function stepdetail (browser) {
.assertStepDetail('63', '63', '', '32000', '79283', '0x0d3a18d64dfe4f927832ab58d6451cecc4e517c5')
.click('#intoforward')
.click('#overforward')
- .assertStepDetail('108', '44', '', '0', '27145', '(Contract Creation - Step 63)')
+ .assertStepDetail('108', '44', '', '0', '27145', '(ContractCreation-Step63)')
.click('#intoforward')
.assertStepDetail('109', '64', '', '3', '25145', '0x0d3a18d64dfe4f927832ab58d6451cecc4e517c5')
return browser