Fix path to options page.

- Update options page fallback with path to dist - Dial down non-fatal error reporting. We already caught it.
ipfs · Nov 27, 2017 · 84ed233 · 84ed233
1 parent 6bb77c0
commit 84ed233
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/add-on/src/lib/ipfs-companion.js b/add-on/src/lib/ipfs-companion.js
@@ -206,7 +206,7 @@ try {
     onclick: copyAddressAtPublicGw
   })
 } catch (err) {
-  console.error('Error creating contextMenus', err)
+  console.log('[ipfs-companion] Error creating contextMenus', err)
 }
 
 function inFirefox () {
@@ -378,7 +378,7 @@ async function updateContextMenus (changedTabId) {
       }
     }
   } catch (err) {
-    console.error('Error updating context menus', err)
+    console.log('[ipfs-companion] Error updating context menus', err)
   }
 }
 

diff --git a/add-on/src/popup/browser-action/store.js b/add-on/src/popup/browser-action/store.js
@@ -110,7 +110,13 @@ module.exports = (state, emitter) => {
   })
 
   emitter.on('openPrefs', () => {
-    browser.runtime.openOptionsPage().then(() => window.close())
+    browser.runtime.openOptionsPage()
+      .then(() => window.close())
+      .catch((err) => {
+        console.error('runtime.openOptionsPage() failed, opening options page in tab instead.', err)
+        // brave: fallback to opening options page as a tab.
+        browser.tabs.create({ url: browser.extension.getURL('dist/options/options.html') })
+      })
   })
 
   emitter.on('toggleRedirect', async () => {