fix: reactivate legacy migration and fix missing var

stoically · Jun 30, 2019 · 7f4337f · 7f4337f
1 parent fe7fd6f
commit 7f4337f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/background/migration-legacy.js b/src/background/migration-legacy.js
@@ -3,21 +3,22 @@
 
 let migrationReady;
 const migrationReadyPromise = new window.PCancelable(resolve => migrationReady = resolve);
-window.setTimeout(() => {
+const migrationReadyTimeout = window.setTimeout(() => {
   migrationReadyPromise.cancel();
 }, 15000);
 
 const migrationOnInstalledListener = async function() {
   browser.runtime.onInstalled.removeListener(migrationOnInstalledListener);
   const {version} = await browser.storage.local.get('version');
   if (version) {
+    clearTimeout(migrationReadyTimeout);
     debug('[migration-legacy] version found, skip', version);
     return;
   }
 
   try {
     await migrationReadyPromise;
-    // return tmp.migration.onInstalled.call(tmp.migration, ...arguments);
+    return tmp.migration.onInstalled.call(tmp.migration, ...arguments);
   } catch (error) {
     debug('[migration-legacy] waiting for migration ready timed out');
   }
@@ -32,7 +33,7 @@ window.migrationLegacy = async (migration) => {
       window.setTimeout(() => {
         // onInstalled didnt fire, again.
         reject();
-      }, 5000);
+      }, 15000);
       debug('[migration-legacy] ready');
       migrationReady();
     });

diff --git a/src/background/runtime.js b/src/background/runtime.js
@@ -11,6 +11,7 @@ class Runtime {
     this.browseraction = this.background.browseraction;
     this.migration = this.background.migration;
     this.permissions = this.background.permissions;
+    this.contextmenu = this.background.contextmenu;
 
     browser.runtime.onMessageExternal.addListener(this.onMessageExternal.bind(this));
   }