fix loading compiler

pull/1/head
yann300 7 years ago
parent 10588ab192
commit 71729bd8da
  1. 4
      manifest.json
  2. 6
      package.json
  3. 2
      src/app/panels/file-panel.js
  4. 4
      src/app/tabs/settings-tab.js

@ -1,7 +1,7 @@
{ {
"name": "Solidity", "name": "Solidity",
"description": "Realtime compiler and runtime", "description": "Realtime compiler and runtime",
"update_url": "https://ethereum.github.io/remix-ide/", "update_url": "https://remix.ethereum.org",
"version": "1.1", "version": "1.1",
"manifest_version": 2, "manifest_version": 2,
"background": { "background": {
@ -27,5 +27,5 @@
"<all_urls>" "<all_urls>"
], ],
"content_security_policy": "script-src 'self' https://ethereum.github.io/solc-bin/bin/; object-src 'self'" "content_security_policy": "script-src 'self' https://solc-bin.ethereum.org/; object-src 'self'"
} }

@ -1,6 +1,6 @@
{ {
"name": "remix-ide", "name": "remix-ide",
"version": "0.5.2-alpha.6", "version": "0.5.2-alpha.7",
"description": "Minimalistic browser-based Solidity IDE", "description": "Minimalistic browser-based Solidity IDE",
"devDependencies": { "devDependencies": {
"async": "^2.1.2", "async": "^2.1.2",
@ -144,8 +144,8 @@
"build": "browserify src/index.js -o build/app.js", "build": "browserify src/index.js -o build/app.js",
"browsertest": "sleep 5 && npm run nightwatch_local", "browsertest": "sleep 5 && npm run nightwatch_local",
"csslint": "csslint --ignore=order-alphabetical --errors='errors,duplicate-properties,empty-rules' --exclude-list='assets/css/font-awesome.min.css' assets/css/", "csslint": "csslint --ignore=order-alphabetical --errors='errors,duplicate-properties,empty-rules' --exclude-list='assets/css/font-awesome.min.css' assets/css/",
"downloadsolc": "rimraf soljson.js && cd node_modules/solc && wget https://ethereum.github.io/solc-bin/soljson.js && cd ../../", "downloadsolc": "rimraf soljson.js && cd node_modules/solc && wget https://solc-bin.ethereum.org/soljson.js && cd ../../",
"downloadsolc_root": "wget https://ethereum.github.io/solc-bin/soljson.js", "downloadsolc_root": "wget https://solc-bin.ethereum.org/soljson.js",
"lint": "standard | notify-error", "lint": "standard | notify-error",
"make-mock-compiler": "node ci/makeMockCompiler.js", "make-mock-compiler": "node ci/makeMockCompiler.js",
"minify": "uglifyjs --in-source-map inline --source-map-inline -c warnings=false", "minify": "uglifyjs --in-source-map inline --source-map-inline -c warnings=false",

@ -318,7 +318,7 @@ function filepanel (appAPI, filesProvider) {
// ------------------ copy files -------------- // ------------------ copy files --------------
function copyFiles () { function copyFiles () {
modalDialogCustom.prompt(null, 'To which other remix-ide instance do you want to copy over all files?', 'https://ethereum.github.io/remix-ide/', (target) => { modalDialogCustom.prompt(null, 'To which other remix-ide instance do you want to copy over all files?', 'https://remix.ethereum.org', (target) => {
doCopy(target) doCopy(target)
}) })
function doCopy (target) { function doCopy (target) {

@ -174,7 +174,7 @@ function SettingsTab (appAPI = {}, appEvents = {}, opts = {}) {
header.selected = true header.selected = true
versionSelector.appendChild(header) versionSelector.appendChild(header)
$.getJSON('https://ethereum.github.io/solc-bin/bin/list.json').done(function (data) { $.getJSON('https://solc-bin.ethereum.org/bin/list.json').done(function (data) {
// populate version dropdown with all available compiler versions (descending order) // populate version dropdown with all available compiler versions (descending order)
$.each(data.builds.slice().reverse(), function (i, build) { $.each(data.builds.slice().reverse(), function (i, build) {
versionSelector.appendChild(new Option(build.longVersion, build.path)) versionSelector.appendChild(new Option(build.longVersion, build.path))
@ -228,7 +228,7 @@ function loadVersion (version, queryParams, appAPI, el) {
console.log('loading ' + version + ' not allowed') console.log('loading ' + version + ' not allowed')
return return
} }
url = 'https://ethereum.github.io/solc-bin/bin/' + version url = 'https://solc-bin.ethereum.org/bin/' + version
} }
var isFirefox = typeof InstallTrigger !== 'undefined' var isFirefox = typeof InstallTrigger !== 'undefined'
if (document.location.protocol !== 'file:' && Worker !== undefined && isFirefox) { if (document.location.protocol !== 'file:' && Worker !== undefined && isFirefox) {

Loading…
Cancel
Save