fix import external

pull/1/head
yann300 7 years ago
parent 7be40bffe8
commit 27c6efddfd
  1. 30
      src/app.js

@ -217,6 +217,21 @@ This instance of Remix you are visiting WILL NOT BE UPDATED.\n
Please make a backup of your contracts and start using http://remix.ethereum.org`) Please make a backup of your contracts and start using http://remix.ethereum.org`)
} }
function importExternal (url, cb) {
handleImports.import(url,
(loadingMsg) => {
$('#output').append($('<div/>').append($('<pre/>').text(loadingMsg)))
},
(error, content, cleanUrl, type, url) => {
if (!error) {
filesProviders[type].addReadOnly(cleanUrl, content, url)
cb(null, content)
} else {
cb(error)
}
})
}
// ----------------- Compiler ----------------- // ----------------- Compiler -----------------
var compiler = new Compiler((url, cb) => { var compiler = new Compiler((url, cb) => {
var provider = fileManager.fileProviderOf(url) var provider = fileManager.fileProviderOf(url)
@ -226,22 +241,11 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
if (exist) { if (exist) {
return provider.get(url, cb) return provider.get(url, cb)
} else { } else {
return cb('Unable to import "' + url + '": File not found') importExternal(url, cb)
} }
}) })
} else { } else {
handleImports.import(url, importExternal(url, cb)
(loadingMsg) => {
$('#output').append($('<div/>').append($('<pre/>').text(loadingMsg)))
},
(error, content, cleanUrl, type, url) => {
if (!error) {
filesProviders[type].addReadOnly(cleanUrl, content, url)
cb(null, content)
} else {
cb(error)
}
})
} }
}) })
var offsetToLineColumnConverter = new OffsetToLineColumnConverter(compiler.event) var offsetToLineColumnConverter = new OffsetToLineColumnConverter(compiler.event)

Loading…
Cancel
Save