Commit 9be2ed01 authored by yann300's avatar yann300

rollback and fix activation ordering

parent 352a4089
...@@ -460,7 +460,8 @@ Please make a backup of your contracts and start using http://remix.ethereum.org ...@@ -460,7 +460,8 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
await appManager.activatePlugin(['mainPanel', 'menuicons', 'tabs']) await appManager.activatePlugin(['mainPanel', 'menuicons', 'tabs'])
await appManager.activatePlugin(['sidePanel']) // activating host plugin separately await appManager.activatePlugin(['sidePanel']) // activating host plugin separately
await appManager.activatePlugin(['home']) await appManager.activatePlugin(['home'])
await appManager.activatePlugin(['hiddenPanel', 'pluginManager', 'filePanel', 'settings', 'contextualListener', 'terminal', 'fetchAndCompile', 'contentImport']) await appManager.activatePlugin(['settings'])
await appManager.activatePlugin(['hiddenPanel', 'pluginManager', 'filePanel', 'contextualListener', 'terminal', 'fetchAndCompile', 'contentImport'])
const queryParams = new QueryParams() const queryParams = new QueryParams()
const params = queryParams.get() const params = queryParams.get()
......
...@@ -26,10 +26,6 @@ export class CompilerImports extends Plugin { ...@@ -26,10 +26,6 @@ export class CompilerImports extends Plugin {
this.urlResolver.setGistToken(token, protocol) this.urlResolver.setGistToken(token, protocol)
} }
onActivation () {
this.setToken()
}
isRelativeImport (url) { isRelativeImport (url) {
return /^([^/]+)/.exec(url) return /^([^/]+)/.exec(url)
} }
...@@ -73,6 +69,7 @@ export class CompilerImports extends Plugin { ...@@ -73,6 +69,7 @@ export class CompilerImports extends Plugin {
let resolved let resolved
try { try {
await this.setToken()
resolved = await this.urlResolver.resolve(url) resolved = await this.urlResolver.resolve(url)
const { content, cleanUrl, type } = resolved const { content, cleanUrl, type } = resolved
self.previouslyHandled[url] = { self.previouslyHandled[url] = {
......
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