From 0442047248c8d1b9ed384decd9ef888cfda2e801 Mon Sep 17 00:00:00 2001 From: LianaHus Date: Wed, 26 Jun 2019 13:09:56 +0200 Subject: [PATCH] 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')