Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
baas-ide
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
guxukai
baas-ide
Commits
66fa2946
Commit
66fa2946
authored
Sep 01, 2016
by
chriseth
Committed by
GitHub
Sep 01, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #200 from ethereum/clean-compiler-url
Move the solc lookup URL to the proper location
parents
55767323
4793fca8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
10 deletions
+9
-10
app.js
src/app.js
+8
-3
compiler.js
src/app/compiler.js
+1
-7
No files found.
src/app.js
View file @
66fa2946
...
...
@@ -352,7 +352,6 @@ var run = function () {
$
(
'#versionSelector'
).
append
(
new
Option
(
'latest local version'
,
'soljson.js'
));
$
(
'#versionSelector'
).
change
(
function
()
{
queryParams
.
update
({
version
:
$
(
'#versionSelector'
).
val
()
});
loadVersion
(
$
(
'#versionSelector'
).
val
());
});
...
...
@@ -487,14 +486,20 @@ var run = function () {
if
(
window
.
soljsonReleases
!==
undefined
&&
window
.
soljsonReleases
[
version
]
!==
undefined
)
{
version
=
window
.
soljsonReleases
[
version
];
}
var
url
;
if
(
version
!==
'soljson.js'
)
{
url
=
'https://ethereum.github.io/solc-bin/bin/'
+
version
;
}
else
{
url
=
'soljson.js'
;
}
var
isFirefox
=
typeof
InstallTrigger
!==
'undefined'
;
if
(
document
.
location
.
protocol
!==
'file:'
&&
Worker
!==
undefined
&&
isFirefox
)
{
// Workers cannot load js on "file:"-URLs and we get a
// "Uncaught RangeError: Maximum call stack size exceeded" error on Chromium,
// resort to non-worker version in that case.
compiler
.
loadVersion
(
true
,
version
);
compiler
.
loadVersion
(
true
,
url
);
}
else
{
compiler
.
loadVersion
(
false
,
version
);
compiler
.
loadVersion
(
false
,
url
);
}
};
...
...
src/app/compiler.js
View file @
66fa2946
...
...
@@ -123,13 +123,7 @@ function Compiler (editor, queryParams, handleGithubCall, updateFiles) {
}
}
this
.
loadVersion
=
function
(
usingWorker
,
version
)
{
var
url
;
if
(
version
!==
'soljson.js'
)
{
url
=
'https://ethereum.github.io/solc-bin/bin/'
+
version
;
}
else
{
url
=
'soljson.js'
;
}
this
.
loadVersion
=
function
(
usingWorker
,
url
)
{
console
.
log
(
'Loading '
+
url
+
' '
+
(
usingWorker
?
'with worker'
:
'without worker'
));
if
(
usingWorker
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment