Move location code to upstream loadVersion()

pull/1/head
Alex Beregszaszi 8 years ago
parent d5688180a7
commit 55bf553df9
  1. 8
      src/app.js
  2. 7
      src/app/compiler.js

@ -516,7 +516,13 @@ var run = function () {
queryParams.update({ version: version }); queryParams.update({ version: version });
var url; var url;
if (version === 'builtin') { if (version === 'builtin') {
url = 'soljson.js'; var location = window.document.location;
location = location.protocol + '//' + location.host + '/' + location.pathname;
if (!location.endsWith('/')) {
location += '/';
}
url = location + 'soljson.js';
} else { } else {
url = 'https://ethereum.github.io/solc-bin/bin/' + version; url = 'https://ethereum.github.io/solc-bin/bin/' + version;
} }

@ -201,13 +201,6 @@ function Compiler (editor, handleGithubCall) {
jobs.push({sources: source}); jobs.push({sources: source});
worker.postMessage({cmd: 'compile', job: jobs.length - 1, source: JSON.stringify(source), optimize: optimize}); worker.postMessage({cmd: 'compile', job: jobs.length - 1, source: JSON.stringify(source), optimize: optimize});
}; };
if (!url.startsWith('http') && !url.startsWith('file')) {
var loc = window.document.location;
var locStr = loc.protocol + '//' + loc.host + '/' + loc.pathname;
if (!locStr.endsWith('/'))
locStr += '/';
url = locStr + url;
}
worker.postMessage({cmd: 'loadVersion', data: url}); worker.postMessage({cmd: 'loadVersion', data: url});
} }

Loading…
Cancel
Save