Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: lib/options.js

Issue 29784585: Issue 6675 - Don't use relative path for info module require (Closed)
Patch Set: Created May 17, 2018, 1:48 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « lib/filterComposer.js ('k') | lib/prefs.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-present eyeo GmbH 3 * Copyright (C) 2006-present eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 /** @module options */ 18 /** @module options */
19 19
20 "use strict"; 20 "use strict";
21 21
22 const {checkWhitelisted} = require("./whitelisting"); 22 const {checkWhitelisted} = require("./whitelisting");
23 const info = require("../buildtools/info"); 23 const info = require("info");
24 24
25 const manifest = browser.runtime.getManifest(); 25 const manifest = browser.runtime.getManifest();
26 const optionsUrl = manifest.options_page || manifest.options_ui.page; 26 const optionsUrl = manifest.options_page || manifest.options_ui.page;
27 27
28 function findOptionsTab(callback) 28 function findOptionsTab(callback)
29 { 29 {
30 browser.tabs.query({}, tabs => 30 browser.tabs.query({}, tabs =>
31 { 31 {
32 // We find a tab ourselves because Edge has a bug when quering tabs with 32 // We find a tab ourselves because Edge has a bug when quering tabs with
33 // extension URL protocol: 33 // extension URL protocol:
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 args: [ 211 args: [
212 { 212 {
213 host: currentPage.url.hostname.replace(/^www\./, ""), 213 host: currentPage.url.hostname.replace(/^www\./, ""),
214 whitelisted: !!checkWhitelisted(currentPage) 214 whitelisted: !!checkWhitelisted(currentPage)
215 } 215 }
216 ] 216 ]
217 }); 217 });
218 }); 218 });
219 }); 219 });
220 }); 220 });
OLDNEW
« no previous file with comments | « lib/filterComposer.js ('k') | lib/prefs.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld