Commit 5811ac8f authored by Alex Beregszaszi's avatar Alex Beregszaszi

Move all compiler primitives to compiler.js from app.js

parent cda62365
...@@ -424,17 +424,7 @@ var run = function () { ...@@ -424,17 +424,7 @@ var run = function () {
// resort to non-worker version in that case. // resort to non-worker version in that case.
compiler.initializeWorker(version, setVersionText); compiler.initializeWorker(version, setVersionText);
} else { } else {
Module = null; compiler.loadVersion(version, setVersionText);
compiler.setCompileJSON()
var newScript = document.createElement('script');
newScript.type = 'text/javascript';
newScript.src = 'https://ethereum.github.io/solc-bin/bin/' + version;
document.getElementsByTagName('head')[0].appendChild(newScript);
var check = window.setInterval(function () {
if (!Module) return;
window.clearInterval(check);
compiler.onCompilerLoaded(setVersionText);
}, 200);
} }
}; };
......
...@@ -63,9 +63,10 @@ function Compiler (editor, handleGithubCall, outputField, hidingRHP, updateFiles ...@@ -63,9 +63,10 @@ function Compiler (editor, handleGithubCall, outputField, hidingRHP, updateFiles
editor.setAnnotations(sourceAnnotations); editor.setAnnotations(sourceAnnotations);
}; };
this.setCompileJSON = function () { function setCompileJSON () {
compileJSON = function (source, optimize) { compilationFinished('{}'); }; compileJSON = function(source, optimize) { compilationFinished('{}'); };
}; };
this.setCompileJSON = setCompileJSON;
function onCompilerLoaded (setVersionText) { function onCompilerLoaded (setVersionText) {
if (worker === null) { if (worker === null) {
...@@ -136,6 +137,22 @@ function Compiler (editor, handleGithubCall, outputField, hidingRHP, updateFiles ...@@ -136,6 +137,22 @@ function Compiler (editor, handleGithubCall, outputField, hidingRHP, updateFiles
} }
} }
this.loadVersion = function (version, setVersionText) {
Module = null;
setCompileJSON();
var newScript = document.createElement('script');
newScript.type = 'text/javascript';
newScript.src = url;
document.getElementsByTagName('head')[0].appendChild(newScript);
var check = window.setInterval(function () {
if (!Module) {
return;
}
window.clearInterval(check);
onCompilerLoaded(setVersionText);
}, 200);
};
this.initializeWorker = function (version, setVersionText) { this.initializeWorker = function (version, setVersionText) {
if (worker !== null) { if (worker !== null) {
worker.terminate(); worker.terminate();
......
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