From b5465f58d0b4b4aac3466f236f0eccb4fd778892 Mon Sep 17 00:00:00 2001 From: LianaHus Date: Fri, 21 Jun 2019 12:17:24 +0200 Subject: [PATCH 1/7] compiler tab style fixes. same padding for all items --- src/app/tabs/compile-tab.js | 2 +- src/app/tabs/compileTab/compilerContainer.js | 8 ++++---- src/app/tabs/styles/compile-tab-styles.js | 3 +++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/app/tabs/compile-tab.js b/src/app/tabs/compile-tab.js index 85db2a50b9..54f4ff7b06 100644 --- a/src/app/tabs/compile-tab.js +++ b/src/app/tabs/compile-tab.js @@ -396,7 +396,7 @@ class CompileTab extends CompilerApi { render () { if (this._view.el) return this._view.el this.listenToEvents() - this._view.errorContainer = yo`
` + this._view.errorContainer = yo`
` this._view.contractSelection = this.contractSelection() this._view.compilerContainer = this.compilerContainer.render() this.compilerContainer.activate() diff --git a/src/app/tabs/compileTab/compilerContainer.js b/src/app/tabs/compileTab/compilerContainer.js index f15c2430bb..ad0998d94f 100644 --- a/src/app/tabs/compileTab/compilerContainer.js +++ b/src/app/tabs/compileTab/compilerContainer.js @@ -166,10 +166,10 @@ class CompilerContainer {
-
+
- +
${this._view.versionSelector} @@ -177,7 +177,7 @@ class CompilerContainer {
- +
` + this._view.languageSelector = yo` + ` this._view.version = yo`` this._view.evmVersionSelector = yo` @@ -177,13 +187,10 @@ class CompilerContainer {
- +
- + ${this._view.languageSelector}
@@ -217,6 +224,7 @@ class CompilerContainer {
` + this._updateLanguageSelector() return this._view.compileContainer } @@ -240,7 +248,9 @@ class CompilerContainer { onchangeLanguage (event) { this.compileTabLogic.setLanguage(event.target.value) - this.compile() + if (this.config.get('currentFile') && this.config.get('autoCompile')) { + this.compile() + } } onchangeEvmVersion (_) { @@ -256,6 +266,7 @@ class CompilerContainer { onchangeLoadVersion (event) { this.data.selectedVersion = this._view.versionSelector.value this._updateVersionSelector() + this._updateLanguageSelector() } _updateVersionSelector () { @@ -294,6 +305,16 @@ class CompilerContainer { } } + _updateLanguageSelector () { + if (this._retriveVersion() < '0.5.7') { + this._view.languageSelector.setAttribute('disabled', '') + this._view.languageSelector.value = 'Solidity' + this.compileTabLogic.setLanguage('Solidity') + } else { + this._view.languageSelector.removeAttribute('disabled') + } + } + setVersionText (text) { this.data.version = text if (this._view.version) this._view.version.innerText = text From a6a9df4403671d55cc9782525d738589aec54879 Mon Sep 17 00:00:00 2001 From: LianaHus Date: Mon, 24 Jun 2019 17:27:20 +0200 Subject: [PATCH 3/7] standard --- src/app/tabs/compileTab/compilerContainer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/tabs/compileTab/compilerContainer.js b/src/app/tabs/compileTab/compilerContainer.js index 6555fa1d4b..f6f2bb4259 100644 --- a/src/app/tabs/compileTab/compilerContainer.js +++ b/src/app/tabs/compileTab/compilerContainer.js @@ -110,9 +110,9 @@ class CompilerContainer { return el } - _retriveVersion() { + _retriveVersion () { let version = this._view.versionSelector.value - return version.substring(9,14) + return version.substring(9, 14) } render () { From 4aa569184b0e0836b795a5404cb4e3ea6dabfe8f Mon Sep 17 00:00:00 2001 From: LianaHus Date: Wed, 26 Jun 2019 08:42:46 +0200 Subject: [PATCH 4/7] typo --- src/app/tabs/compileTab/compilerContainer.js | 4 +-- src/universal-dapp-ui.js | 27 +++++++++++++++----- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/app/tabs/compileTab/compilerContainer.js b/src/app/tabs/compileTab/compilerContainer.js index f6f2bb4259..9d8f29267e 100644 --- a/src/app/tabs/compileTab/compilerContainer.js +++ b/src/app/tabs/compileTab/compilerContainer.js @@ -110,7 +110,7 @@ class CompilerContainer { return el } - _retriveVersion () { + _retrieveVersion () { let version = this._view.versionSelector.value return version.substring(9, 14) } @@ -306,7 +306,7 @@ class CompilerContainer { } _updateLanguageSelector () { - if (this._retriveVersion() < '0.5.7') { + if (this._retrieveVersion() < '0.5.7') { this._view.languageSelector.setAttribute('disabled', '') this._view.languageSelector.value = 'Solidity' this.compileTabLogic.setLanguage('Solidity') diff --git a/src/universal-dapp-ui.js b/src/universal-dapp-ui.js index 8150cc2178..d519fd6ac9 100644 --- a/src/universal-dapp-ui.js +++ b/src/universal-dapp-ui.js @@ -69,21 +69,36 @@ UniversalDAppUI.prototype.renderInstanceFromABI = function (contractABI, address var shortAddress = helper.shortenAddress(address) var title = yo`
- +
-
${contractName} at ${shortAddress} (${context})
+
+ + ${contractName} at ${shortAddress} (${context}) + +
-
` + + ` - var close = yo`` + var close = yo` + ` title.querySelector('.btn-group').appendChild(close) var contractActionsWrapper = yo` -
-
` +
+
+ ` function remove () { instance.remove() From 411a5e6a6b4f4b8682524e08a213ed227e7d0295 Mon Sep 17 00:00:00 2001 From: Liana Husikyan Date: Wed, 26 Jun 2019 09:47:10 +0200 Subject: [PATCH 5/7] remove check before compile. will be added in new PR --- src/app/tabs/compileTab/compilerContainer.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/app/tabs/compileTab/compilerContainer.js b/src/app/tabs/compileTab/compilerContainer.js index 9d8f29267e..de72ca54f0 100644 --- a/src/app/tabs/compileTab/compilerContainer.js +++ b/src/app/tabs/compileTab/compilerContainer.js @@ -248,9 +248,7 @@ class CompilerContainer { onchangeLanguage (event) { this.compileTabLogic.setLanguage(event.target.value) - if (this.config.get('currentFile') && this.config.get('autoCompile')) { - this.compile() - } + this.compile() } onchangeEvmVersion (_) { From 5fde1730dec52bdf39570a05e5698879996d60d5 Mon Sep 17 00:00:00 2001 From: LianaHus Date: Wed, 26 Jun 2019 13:09:56 +0200 Subject: [PATCH 6/7] added semver --- package.json | 3 ++- src/app/tabs/compileTab/compilerContainer.js | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 011d337766..c23543f09f 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,8 @@ "dependencies": { "http-server": "^0.11.1", "remix-plugin": "0.0.2-alpha.10", - "remixd": "0.1.8-alpha.6" + "remixd": "0.1.8-alpha.6", + "semver": "^6.1.2" }, "repository": { "type": "git", diff --git a/src/app/tabs/compileTab/compilerContainer.js b/src/app/tabs/compileTab/compilerContainer.js index de72ca54f0..dcf7e287af 100644 --- a/src/app/tabs/compileTab/compilerContainer.js +++ b/src/app/tabs/compileTab/compilerContainer.js @@ -3,6 +3,7 @@ const yo = require('yo-yo') var minixhr = require('minixhr') var helper = require('../../../lib/helper') const addTooltip = require('../../ui/tooltip') +const semver = require('semver') var css = require('../styles/compile-tab-styles') @@ -76,6 +77,7 @@ class CompilerContainer { this._view.compileIcon.setAttribute('title', 'compiler is loading, please wait a few moments.') this._view.compileIcon.classList.add(`${css.spinningIcon}`) this._view.warnCompilationSlow.style.visibility = 'hidden' + this._updateLanguageSelector() }) this.compileTabLogic.compiler.event.register('compilerLoaded', () => { @@ -224,7 +226,6 @@ class CompilerContainer { ` - this._updateLanguageSelector() return this._view.compileContainer } @@ -304,7 +305,7 @@ class CompilerContainer { } _updateLanguageSelector () { - if (this._retrieveVersion() < '0.5.7') { + if (semver.lt(this._retrieveVersion(), '0.5.7')) { this._view.languageSelector.setAttribute('disabled', '') this._view.languageSelector.value = 'Solidity' this.compileTabLogic.setLanguage('Solidity') From 8bfdac081cac24b9abb276e8c9dca62e9fb187d1 Mon Sep 17 00:00:00 2001 From: LianaHus Date: Wed, 26 Jun 2019 15:15:06 +0200 Subject: [PATCH 7/7] added semver to devDependencies --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index c23543f09f..ed676f834b 100644 --- a/package.json +++ b/package.json @@ -68,13 +68,13 @@ "web3": "1.0.0-beta.27", "webworkify": "^1.2.1", "yo-yo": "^1.2.2", - "yo-yoify": "^3.7.3" + "yo-yoify": "^3.7.3", + "semver": "^6.1.2" }, "dependencies": { "http-server": "^0.11.1", "remix-plugin": "0.0.2-alpha.10", - "remixd": "0.1.8-alpha.6", - "semver": "^6.1.2" + "remixd": "0.1.8-alpha.6" }, "repository": { "type": "git",