Unified Diff: lib/options.js
Issue 29782593:
Noissue - Don't hard-code options and popup URL (Closed)
Patch Set: Add default_popup on Firefox
Created May 15, 2018, 2:14 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
metadata.gecko » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: lib/options.js |
| =================================================================== |
| --- a/lib/options.js |
| +++ b/lib/options.js |
| @@ -22,7 +22,8 @@ |
| const {checkWhitelisted} = require("./whitelisting"); |
| const info = require("../buildtools/info"); |
| -const optionsUrl = "options.html"; |
| +const manifest = browser.runtime.getManifest(); |
| +const optionsUrl = manifest.options_page || manifest.options_ui.page; |
| function findOptionsTab(callback) |
| { |
| @@ -186,14 +187,10 @@ |
| { |
| browser.runtime.getBrowserInfo().then(browserInfo => |
| { |
| - if (browserInfo.name != "Fennec") |
| - browser.browserAction.setPopup({popup: "popup.html"}); |
| + if (browserInfo.name == "Fennec") |
| + browser.browserAction.setPopup({popup: null}); |
| }); |
| } |
| -else |
| -{ |
| - browser.browserAction.setPopup({popup: "popup.html"}); |
| -} |
| // On Firefox for Android, open the options page directly when the browser |
| // action is clicked. |
« no previous file with comments
|
« no previous file
|
metadata.gecko » ('j')
|
no next file with comments »
