Commit 73a5582a authored by chriseth's avatar chriseth Committed by GitHub

Merge pull request #272 from ethereum/solc-bin-update

Simplify code by using the latest features from solc-bin
parents 9391a69f 91c89c9c
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
'use strict'; 'use strict';
var $ = require('jquery'); var $ = require('jquery');
var semver = require('semver');
var base64 = require('js-base64').Base64; var base64 = require('js-base64').Base64;
var utils = require('./app/utils'); var utils = require('./app/utils');
...@@ -555,22 +554,8 @@ var run = function () { ...@@ -555,22 +554,8 @@ var run = function () {
}); });
$.getJSON('https://ethereum.github.io/solc-bin/bin/list.json').done(function (data) { $.getJSON('https://ethereum.github.io/solc-bin/bin/list.json').done(function (data) {
function buildVersion (build) { // populate version dropdown with all available compiler versions (descending order)
if (build.prerelease && build.prerelease.length > 0) { $.each(data.builds.slice().reverse(), function (i, build) {
return build.version + '-' + build.prerelease;
} else {
return build.version;
}
}
// Sort builds according to semver
var builds = data.builds.sort(function (a, b) {
// NOTE: b vs. a (the order is important), because we want latest first in the list
return semver.compare(buildVersion(b), buildVersion(a));
});
// populate version dropdown with all available compiler versions
$.each(builds, function (i, build) {
$('#versionSelector').append(new Option(buildVersion(build), build.path)); $('#versionSelector').append(new Option(buildVersion(build), build.path));
}); });
...@@ -580,15 +565,7 @@ var run = function () { ...@@ -580,15 +565,7 @@ var run = function () {
$('#versionSelector').append(new Option('latest local version', 'builtin')); $('#versionSelector').append(new Option('latest local version', 'builtin'));
// find latest release // find latest release
var selectedVersion = null; var selectedVersion = data.releases[data.latestRelease];
for (var release in data.releases) {
if (selectedVersion === null || semver.gt(release, selectedVersion)) {
selectedVersion = release;
}
}
if (selectedVersion !== null) {
selectedVersion = data.releases[selectedVersion];
}
// override with the requested version // override with the requested version
if (queryParams.get().version) { if (queryParams.get().version) {
......
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