From 5274a2f3ab1934803776b35078e13984d1d341da Mon Sep 17 00:00:00 2001 From: yann300 Date: Mon, 17 Sep 2018 09:02:26 +0200 Subject: [PATCH 01/16] don't clear input after sending --- src/multiParamManager.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/multiParamManager.js b/src/multiParamManager.js index dd4e55559d..6600b78381 100644 --- a/src/multiParamManager.js +++ b/src/multiParamManager.js @@ -122,7 +122,6 @@ class MultiParamManager { var onClick = (domEl) => { this.clickCallBack(this.funABI.inputs, this.basicInputField.value) - this.emptyInputs() } this.contractActionsContainerSingle = yo`
@@ -138,7 +137,6 @@ class MultiParamManager { } else { this.clickCallBack(this.funABI.inputs, '') } - this.emptyInputs() } var button = yo`` From cd80e1d4d9495d684dad4bbcc200cf32b7d185a6 Mon Sep 17 00:00:00 2001 From: yann300 Date: Mon, 17 Sep 2018 09:13:26 +0200 Subject: [PATCH 02/16] add api in terminal "getFile" --- src/lib/cmdInterpreterAPI.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/lib/cmdInterpreterAPI.js b/src/lib/cmdInterpreterAPI.js index cef5a05579..321d5692cb 100644 --- a/src/lib/cmdInterpreterAPI.js +++ b/src/lib/cmdInterpreterAPI.js @@ -28,6 +28,7 @@ class CmdInterpreterAPI { offsetToLineColumnConverter: self._components.registry.get('offsettolinecolumnconverter').api } self.commandHelp = { + 'remix.getFile(path)': 'Returns te content of the file located at the given path', 'remix.debug(hash)': 'Start debugging a transaction.', 'remix.loadgist(id)': 'Load a gist in the file explorer.', 'remix.loadurl(url)': 'Load the given url in the file explorer. The url can be of type github, swarm, ipfs or raw http', @@ -163,6 +164,14 @@ class CmdInterpreterAPI { exeCurrent (cb) { return this.execute(undefined, cb) } + getFile (path, cb) { + var provider = this._deps.fileManager.fileProviderOf(path) + if (provider) { + provider.get(path, cb) + } else { + cb('file not found') + } + } execute (file, cb) { const self = this From d98dc0f1b9278007f96229aa0c15181a96de7f1a Mon Sep 17 00:00:00 2001 From: yann300 Date: Mon, 17 Sep 2018 13:50:04 +0200 Subject: [PATCH 03/16] improve UX run tab --- src/app/tabs/run-tab.js | 32 ++++++++++++++++++++++----- src/app/tabs/styles/run-tab-styles.js | 8 +++++-- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/src/app/tabs/run-tab.js b/src/app/tabs/run-tab.js index 377e953b68..e979b20254 100644 --- a/src/app/tabs/run-tab.js +++ b/src/app/tabs/run-tab.js @@ -303,6 +303,25 @@ function contractDropdown (events, self) { } }) + var deployAction = (value) => { + self._view.createPanel.style.display = value + self._view.orLabel.style.display = value + } + + self._deps.fileManager.event.register('currentFileChanged', (currentFile) => { + if (/.(.abi)$/.exec(currentFile)) { + deployAction('none') + compFails.style.display = 'none' + document.querySelector(`.${css.contractNames}`).classList.remove(css.contractNamesError) + var contractNames = document.querySelector(`.${css.contractNames.classNames[0]}`) + contractNames.innerHTML = '' + contractNames.appendChild(yo``) + selectContractNames.setAttribute('disabled', true) + } else if (/.(.sol)$/.exec(currentFile)) { + deployAction('block') + } + }) + var atAddressButtonInput = yo`` var selectContractNames = yo`` @@ -317,15 +336,16 @@ function contractDropdown (events, self) { return null } - var createPanel = yo`
` - + self._view.createPanel = yo`
` + self._view.orLabel = yo`
or
` var el = yo`
${selectContractNames} ${compFails}
- ${createPanel} + ${self._view.createPanel} + ${self._view.orLabel}
At Address
${atAddressButtonInput} @@ -335,17 +355,17 @@ function contractDropdown (events, self) { ` function setInputParamsPlaceHolder () { - createPanel.innerHTML = '' + self._view.createPanel.innerHTML = '' if (self._deps.compiler.getContract && selectContractNames.selectedIndex >= 0 && selectContractNames.children.length > 0) { var ctrabi = txHelper.getConstructorInterface(getSelectedContract().contract.object.abi) var ctrEVMbc = getSelectedContract().contract.object.evm.bytecode.object var createConstructorInstance = new MultiParamManager(0, ctrabi, (valArray, inputsValues) => { createInstance(inputsValues) }, txHelper.inputParametersDeclarationToString(ctrabi.inputs), 'Deploy', ctrEVMbc) - createPanel.appendChild(createConstructorInstance.render()) + self._view.createPanel.appendChild(createConstructorInstance.render()) return } else { - createPanel.innerHTML = 'No compiled contracts' + self._view.createPanel.innerHTML = 'No compiled contracts' } } diff --git a/src/app/tabs/styles/run-tab-styles.js b/src/app/tabs/styles/run-tab-styles.js index 02493e9926..51425db511 100644 --- a/src/app/tabs/styles/run-tab-styles.js +++ b/src/app/tabs/styles/run-tab-styles.js @@ -148,7 +148,8 @@ var css = csjs` ${styles.rightPanel.runTab.button_Create} } .input { - ${styles.rightPanel.runTab.input_RunTab} + ${styles.rightPanel.runTab.input_RunTab}; + font-size: 10px; } .noInstancesText { ${styles.rightPanel.runTab.box_Instance} @@ -233,7 +234,10 @@ var css = csjs` justify-content: space-evenly; ${styles.rightPanel.runTab.box_Info_RunTab}; width: 145px; -} + } + .orLabel { + text-align: center; + } ` module.exports = css From 668f4618c28d585902e0151e82f47c9d6201cb67 Mon Sep 17 00:00:00 2001 From: yann300 Date: Mon, 17 Sep 2018 15:00:41 +0200 Subject: [PATCH 04/16] add info icon --- src/app/tabs/run-tab.js | 3 ++- src/app/tabs/styles/run-tab-styles.js | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/tabs/run-tab.js b/src/app/tabs/run-tab.js index e979b20254..416bc733fc 100644 --- a/src/app/tabs/run-tab.js +++ b/src/app/tabs/run-tab.js @@ -292,6 +292,7 @@ function contractDropdown (events, self) { instanceContainer.appendChild(instanceContainerTitle) instanceContainer.appendChild(self._view.noInstancesText) var compFails = yo`` + var info = yo`` self._deps.compiler.event.register('compilationFinished', function (success, data, source) { getContractNames(success, data) if (success) { @@ -341,7 +342,7 @@ function contractDropdown (events, self) { var el = yo`
- ${selectContractNames} ${compFails} + ${selectContractNames} ${compFails} ${info}
${self._view.createPanel} diff --git a/src/app/tabs/styles/run-tab-styles.js b/src/app/tabs/styles/run-tab-styles.js index 51425db511..c926baf8b2 100644 --- a/src/app/tabs/styles/run-tab-styles.js +++ b/src/app/tabs/styles/run-tab-styles.js @@ -238,6 +238,9 @@ var css = csjs` .orLabel { text-align: center; } + .infoDeployAction { + margin-left: 5px; + } ` module.exports = css From bab2627cc619ed719dc5dcd65762639132aadc9c Mon Sep 17 00:00:00 2001 From: yann300 Date: Mon, 17 Sep 2018 17:13:37 +0200 Subject: [PATCH 05/16] change offsetToLineColumn implementation --- src/app/debugger/debugger.js | 4 ++-- src/app/editor/contextView.js | 2 +- src/app/editor/contextualListener.js | 2 +- src/app/staticanalysis/staticAnalysisView.js | 2 +- src/lib/cmdInterpreterAPI.js | 4 ++-- src/lib/offsetToLineColumnConverter.js | 11 ++++++++--- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/app/debugger/debugger.js b/src/app/debugger/debugger.js index 6cd6eb1cc9..2cf969d405 100644 --- a/src/app/debugger/debugger.js +++ b/src/app/debugger/debugger.js @@ -39,7 +39,7 @@ function Debugger (container, sourceHighlighter, localRegistry) { this.isActive = false this.breakPointManager = new remixLib.code.BreakpointManager(this.debugger, (sourceLocation) => { - return self._deps.offsetToLineColumnConverter.offsetToLineColumn(sourceLocation, sourceLocation.file, this._deps.compiler.lastCompilationResult.source.sources) + return self._deps.offsetToLineColumnConverter.offsetToLineColumn(sourceLocation, sourceLocation.file, this._deps.compiler.lastCompilationResult.source.sources, this._deps.compiler.lastCompilationResult.data.sources) }, (step) => { this.debugger_ui.stepManager.jumpTo(step) }) @@ -80,7 +80,7 @@ function Debugger (container, sourceHighlighter, localRegistry) { if (error) return console.log(error) self.debugger.callTree.sourceLocationTracker.getSourceLocationFromVMTraceIndex(address, index, self._deps.compiler.lastCompilationResult.data.contracts, function (error, rawLocation) { if (!error && self._deps.compiler.lastCompilationResult && self._deps.compiler.lastCompilationResult.data) { - var lineColumnPos = self._deps.offsetToLineColumnConverter.offsetToLineColumn(rawLocation, rawLocation.file, self._deps.compiler.lastCompilationResult.source.sources) + var lineColumnPos = self._deps.offsetToLineColumnConverter.offsetToLineColumn(rawLocation, rawLocation.file, self._deps.compiler.lastCompilationResult.source.sources, self._deps.compiler.lastCompilationResult.data.sources) self._components.sourceHighlighter.currentSourceLocation(lineColumnPos, rawLocation) } else { self._components.sourceHighlighter.currentSourceLocation(null) diff --git a/src/app/editor/contextView.js b/src/app/editor/contextView.js index e4781f6b68..68f861681b 100644 --- a/src/app/editor/contextView.js +++ b/src/app/editor/contextView.js @@ -98,7 +98,7 @@ class ContextView { } } if (self._deps.compiler.lastCompilationResult && self._deps.compiler.lastCompilationResult.data) { - var lineColumn = self._deps.offsetToLineColumnConverter.offsetToLineColumn(position, position.file, self._deps.compiler.lastCompilationResult.source.sources) + var lineColumn = self._deps.offsetToLineColumnConverter.offsetToLineColumn(position, position.file, self._deps.compiler.lastCompilationResult.source.sources, self._deps.compiler.lastCompilationResult.data.sources) var filename = self._deps.compiler.getSourceName(position.file) // TODO: refactor with rendererAPI.errorClick if (filename !== self._deps.config.get('currentFile')) { diff --git a/src/app/editor/contextualListener.js b/src/app/editor/contextualListener.js index d55965fd49..0b6848b3b4 100644 --- a/src/app/editor/contextualListener.js +++ b/src/app/editor/contextualListener.js @@ -114,7 +114,7 @@ class ContextualListener { _highlightInternal (position, node) { var self = this if (self._deps.compiler.lastCompilationResult && self._deps.compiler.lastCompilationResult.data) { - var lineColumn = self._deps.offsetToLineColumnConverter.offsetToLineColumn(position, position.file, self._deps.compiler.lastCompilationResult.source.sources) + var lineColumn = self._deps.offsetToLineColumnConverter.offsetToLineColumn(position, position.file, self._deps.compiler.lastCompilationResult.source.sources, self._deps.compiler.lastCompilationResult.data.sources) var css = 'highlightreference' if (node.children && node.children.length) { // If node has children, highlight the entire line. if not, just highlight the current source position of the node. diff --git a/src/app/staticanalysis/staticAnalysisView.js b/src/app/staticanalysis/staticAnalysisView.js index 6bb5b56398..498c1de87b 100644 --- a/src/app/staticanalysis/staticAnalysisView.js +++ b/src/app/staticanalysis/staticAnalysisView.js @@ -97,7 +97,7 @@ staticAnalysisView.prototype.run = function () { start: parseInt(split[0]), length: parseInt(split[1]) } - location = self._deps.offsetToLineColumnConverter.offsetToLineColumn(location, file, self.lastCompilationSource.sources) + location = self._deps.offsetToLineColumnConverter.offsetToLineColumn(location, file, self._deps.compiler.lastCompilationResult.source.sources, self._deps.compiler.lastCompilationResult.data.sources) location = Object.keys(self.lastCompilationResult.contracts)[file] + ':' + (location.start.line + 1) + ':' + (location.start.column + 1) + ':' } warningCount++ diff --git a/src/lib/cmdInterpreterAPI.js b/src/lib/cmdInterpreterAPI.js index 321d5692cb..5f6d8bbe8f 100644 --- a/src/lib/cmdInterpreterAPI.js +++ b/src/lib/cmdInterpreterAPI.js @@ -46,7 +46,7 @@ class CmdInterpreterAPI { self._components.sourceHighlighter.currentSourceLocation(null) return } - var lineColumnPos = self._deps.offsetToLineColumnConverter.offsetToLineColumn(rawLocation, rawLocation.file, self._deps.compiler.lastCompilationResult.source.sources) + var lineColumnPos = self._deps.offsetToLineColumnConverter.offsetToLineColumn(rawLocation, rawLocation.file, self._deps.compiler.lastCompilationResult.source.sources, self._deps.compiler.lastCompilationResult.data.sources) self._components.sourceHighlighter.currentSourceLocation(lineColumnPos, rawLocation) } debug (hash, cb) { @@ -107,7 +107,7 @@ class CmdInterpreterAPI { self.d.goTo = (row) => { if (self._deps.editor.current()) { var breakPoint = new remixLib.code.BreakpointManager(self.d, (sourceLocation) => { - return self._deps.offsetToLineColumnConverter.offsetToLineColumn(sourceLocation, sourceLocation.file, self._deps.compiler.lastCompilationResult.source.sources) + return self._deps.offsetToLineColumnConverter.offsetToLineColumn(sourceLocation, sourceLocation.file, self._deps.compiler.lastCompilationResult.source.sources, self._deps.compiler.lastCompilationResult.data.sources) }) breakPoint.event.register('breakpointHit', (sourceLocation, currentStep) => { self.log(null, 'step index ' + currentStep) diff --git a/src/lib/offsetToLineColumnConverter.js b/src/lib/offsetToLineColumnConverter.js index 2a73dfbe6f..d85d443f89 100644 --- a/src/lib/offsetToLineColumnConverter.js +++ b/src/lib/offsetToLineColumnConverter.js @@ -10,10 +10,15 @@ function offsetToColumnConverter (compilerEvent) { }) } -offsetToColumnConverter.prototype.offsetToLineColumn = function (rawLocation, file, sources) { +offsetToColumnConverter.prototype.offsetToLineColumn = function (rawLocation, file, sources, asts) { if (!this.lineBreakPositionsByContent[file]) { - var filename = Object.keys(sources)[file] - this.lineBreakPositionsByContent[file] = this.sourceMappingDecoder.getLinebreakPositions(sources[filename].content) + for (var filename in asts) { + var source = asts[filename] + if (source.id === file) { + this.lineBreakPositionsByContent[file] = this.sourceMappingDecoder.getLinebreakPositions(sources[filename].content) + break + } + } } return this.sourceMappingDecoder.convertOffsetToLineColumn(rawLocation, this.lineBreakPositionsByContent[file]) } From c6c325b283be6cc3bee4c08abd096b26c78514b7 Mon Sep 17 00:00:00 2001 From: yann300 Date: Mon, 17 Sep 2018 19:14:50 +0200 Subject: [PATCH 06/16] update sauce labs proxy --- ci/browser_tests.sh | 2 +- ci/browser_tests_debugger.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/browser_tests.sh b/ci/browser_tests.sh index eb1e358e8b..abae1828e9 100755 --- a/ci/browser_tests.sh +++ b/ci/browser_tests.sh @@ -19,7 +19,7 @@ else OS="linux" FILEFORMAT="tar.gz" fi -SC_VERSION="4.4.11" +SC_VERSION="4.5.1" SAUCECONNECT_URL="https://saucelabs.com/downloads/sc-$SC_VERSION-$OS.$FILEFORMAT" SAUCECONNECT_USERNAME="chriseth" SAUCECONNECT_ACCESSKEY="b781828a-9e9c-43d8-89d4-2fbb879595ca" diff --git a/ci/browser_tests_debugger.sh b/ci/browser_tests_debugger.sh index 2aa54fb53b..145e154925 100755 --- a/ci/browser_tests_debugger.sh +++ b/ci/browser_tests_debugger.sh @@ -10,7 +10,7 @@ else OS="linux" FILEFORMAT="tar.gz" fi -SC_VERSION="4.4.11" +SC_VERSION="4.5.1" SAUCECONNECT_URL="https://saucelabs.com/downloads/sc-$SC_VERSION-$OS.$FILEFORMAT" SAUCECONNECT_USERNAME="yanneth" SAUCECONNECT_ACCESSKEY="1f5a4560-b02b-41aa-b52b-f033aad30870" From 8f93f74600fb6b7f2bb2e5ea93a419e465f7cc34 Mon Sep 17 00:00:00 2001 From: yann300 Date: Mon, 17 Sep 2018 19:16:55 +0200 Subject: [PATCH 07/16] add discard highlight --- src/app/plugin/pluginAPI.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/app/plugin/pluginAPI.js b/src/app/plugin/pluginAPI.js index a6c8f8dd54..99a738e168 100644 --- a/src/app/plugin/pluginAPI.js +++ b/src/app/plugin/pluginAPI.js @@ -127,6 +127,10 @@ module.exports = (pluginManager, fileProviders, fileManager, compiler, udapp) => highlighter.currentSourceLocation(null) highlighter.currentSourceLocationFromfileName(position, filePath, hexColor) cb() + }, + discardHighlight: (mod, cb) => { + highlighter.currentSourceLocation(null) + cb() } } } From fc4a5fb9d52f5d9fb8acf63a8a1d6575f16ae056 Mon Sep 17 00:00:00 2001 From: yann300 Date: Mon, 17 Sep 2018 19:29:17 +0200 Subject: [PATCH 08/16] clear circle ci cache --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 61aba18604..c419e2f4db 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,10 +26,10 @@ jobs: - checkout - restore_cache: keys: - - dep-bundle-21-{{ checksum "package.json" }} + - dep-bundle-22-{{ checksum "package.json" }} - run: npm install - save_cache: - key: dep-bundle-21-{{ checksum "package.json" }} + key: dep-bundle-22-{{ checksum "package.json" }} paths: - ~/repo/node_modules - run: npm run lint && npm run test && npm run make-mock-compiler && npm run build @@ -46,10 +46,10 @@ jobs: - checkout - restore_cache: keys: - - dep-bundle-16-{{ checksum "package.json" }} + - dep-bundle-17-{{ checksum "package.json" }} - run: npm install - save_cache: - key: dep-bundle-16-{{ checksum "package.json" }} + key: dep-bundle-17-{{ checksum "package.json" }} paths: - ~/repo/node_modules - run: npm run build_debugger From 7975950255f497f481fbdfa89691218764057dec Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 18 Sep 2018 07:55:38 +0200 Subject: [PATCH 09/16] fix label position --- src/app/tabs/styles/run-tab-styles.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/tabs/styles/run-tab-styles.js b/src/app/tabs/styles/run-tab-styles.js index c926baf8b2..b2273e095b 100644 --- a/src/app/tabs/styles/run-tab-styles.js +++ b/src/app/tabs/styles/run-tab-styles.js @@ -236,7 +236,7 @@ var css = csjs` width: 145px; } .orLabel { - text-align: center; + margin-left: 44px; } .infoDeployAction { margin-left: 5px; From a70e0486147252dee75d8e2874682d9472711a2f Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 18 Sep 2018 08:00:23 +0200 Subject: [PATCH 10/16] clear dropdownlist --- src/app/tabs/run-tab.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/tabs/run-tab.js b/src/app/tabs/run-tab.js index 416bc733fc..11475015cd 100644 --- a/src/app/tabs/run-tab.js +++ b/src/app/tabs/run-tab.js @@ -310,12 +310,12 @@ function contractDropdown (events, self) { } self._deps.fileManager.event.register('currentFileChanged', (currentFile) => { + document.querySelector(`.${css.contractNames}`).classList.remove(css.contractNamesError) + var contractNames = document.querySelector(`.${css.contractNames.classNames[0]}`) + contractNames.innerHTML = '' if (/.(.abi)$/.exec(currentFile)) { deployAction('none') compFails.style.display = 'none' - document.querySelector(`.${css.contractNames}`).classList.remove(css.contractNamesError) - var contractNames = document.querySelector(`.${css.contractNames.classNames[0]}`) - contractNames.innerHTML = '' contractNames.appendChild(yo``) selectContractNames.setAttribute('disabled', true) } else if (/.(.sol)$/.exec(currentFile)) { From 2b9ca7aba31be564497e570a28cbb11b8a48cb7f Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 18 Sep 2018 09:27:03 +0200 Subject: [PATCH 11/16] compile icon fix styling --- src/app/tabs/compile-tab.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/tabs/compile-tab.js b/src/app/tabs/compile-tab.js index e4a90efa85..ef83cf1f27 100644 --- a/src/app/tabs/compile-tab.js +++ b/src/app/tabs/compile-tab.js @@ -615,7 +615,7 @@ const css = csjs` color: ${styles.rightPanel.modalDialog_text_Secondary}; } .icon { - margin-right: 3%; + margin-right: 0.3em; } .spinningIcon { margin-right: .3em; From 0d60906e94e7da7ccaa08fdeaace2b30d6ee7e13 Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 18 Sep 2018 09:34:03 +0200 Subject: [PATCH 12/16] don't add new account in ui (added by default when polling get account) --- src/app/tabs/run-tab.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/tabs/run-tab.js b/src/app/tabs/run-tab.js index 11475015cd..e4fbca9595 100644 --- a/src/app/tabs/run-tab.js +++ b/src/app/tabs/run-tab.js @@ -645,7 +645,6 @@ function settings (container, self) { function newAccount () { self._deps.udapp.newAccount('', (error, address) => { if (!error) { - container.querySelector('#txorigin').appendChild(yo``) addTooltip(`account ${address} created`) } else { addTooltip('Cannot create an account: ' + error) From 89e14224d4253b74eef953c76b6ecf6135e9a6f0 Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 18 Sep 2018 09:53:50 +0200 Subject: [PATCH 13/16] fix browser test --- src/app/staticanalysis/staticAnalysisView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/staticanalysis/staticAnalysisView.js b/src/app/staticanalysis/staticAnalysisView.js index 498c1de87b..e12d161d49 100644 --- a/src/app/staticanalysis/staticAnalysisView.js +++ b/src/app/staticanalysis/staticAnalysisView.js @@ -97,7 +97,7 @@ staticAnalysisView.prototype.run = function () { start: parseInt(split[0]), length: parseInt(split[1]) } - location = self._deps.offsetToLineColumnConverter.offsetToLineColumn(location, file, self._deps.compiler.lastCompilationResult.source.sources, self._deps.compiler.lastCompilationResult.data.sources) + location = self._deps.offsetToLineColumnConverter.offsetToLineColumn(location, parseInt(file), self._deps.compiler.lastCompilationResult.source.sources, self._deps.compiler.lastCompilationResult.data.sources) location = Object.keys(self.lastCompilationResult.contracts)[file] + ':' + (location.start.line + 1) + ':' + (location.start.column + 1) + ':' } warningCount++ From 4be75219efe2d58c1e306bd46c71044f891e1483 Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 18 Sep 2018 15:20:53 +0200 Subject: [PATCH 14/16] use info icon --- src/app/tabs/run-tab.js | 2 +- src/app/tabs/styles/run-tab-styles.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/tabs/run-tab.js b/src/app/tabs/run-tab.js index e4fbca9595..8f37c5d5f9 100644 --- a/src/app/tabs/run-tab.js +++ b/src/app/tabs/run-tab.js @@ -292,7 +292,7 @@ function contractDropdown (events, self) { instanceContainer.appendChild(instanceContainerTitle) instanceContainer.appendChild(self._view.noInstancesText) var compFails = yo`` - var info = yo`` + var info = yo`` self._deps.compiler.event.register('compilationFinished', function (success, data, source) { getContractNames(success, data) if (success) { diff --git a/src/app/tabs/styles/run-tab-styles.js b/src/app/tabs/styles/run-tab-styles.js index b2273e095b..e3124e179c 100644 --- a/src/app/tabs/styles/run-tab-styles.js +++ b/src/app/tabs/styles/run-tab-styles.js @@ -240,6 +240,7 @@ var css = csjs` } .infoDeployAction { margin-left: 5px; + font-size: 13px; } ` From dd5da62a9855a4be1bebfec697ecfbfc1d048afd Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 18 Sep 2018 15:21:19 +0200 Subject: [PATCH 15/16] add margin top --- src/app/tabs/run-tab.js | 2 +- src/app/tabs/styles/run-tab-styles.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/tabs/run-tab.js b/src/app/tabs/run-tab.js index 8f37c5d5f9..ed540c2ed4 100644 --- a/src/app/tabs/run-tab.js +++ b/src/app/tabs/run-tab.js @@ -344,7 +344,7 @@ function contractDropdown (events, self) {
${selectContractNames} ${compFails} ${info}
-
+
${self._view.createPanel} ${self._view.orLabel}
diff --git a/src/app/tabs/styles/run-tab-styles.js b/src/app/tabs/styles/run-tab-styles.js index e3124e179c..27a55eecbe 100644 --- a/src/app/tabs/styles/run-tab-styles.js +++ b/src/app/tabs/styles/run-tab-styles.js @@ -124,7 +124,7 @@ var css = csjs` .button { display: flex; align-items: center; - margin-top: 2%; + margin-top: 13px; } .transaction { ${styles.rightPanel.runTab.button_transaction} From 50486e47624059946c08ff63c099c4fee275481e Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 18 Sep 2018 15:54:23 +0200 Subject: [PATCH 16/16] fix styling --- src/app/tabs/styles/run-tab-styles.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/app/tabs/styles/run-tab-styles.js b/src/app/tabs/styles/run-tab-styles.js index 27a55eecbe..1850cd9454 100644 --- a/src/app/tabs/styles/run-tab-styles.js +++ b/src/app/tabs/styles/run-tab-styles.js @@ -140,6 +140,9 @@ var css = csjs` border-bottom-right-radius: 0; border-right: 0; } + .atAddressSect { + margin-top: 6px; + } .atAddressSect input { border-top-left-radius: 0; border-bottom-left-radius: 0;