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

Side by Side Diff: lib/options.js

Issue 29772555: Issue 6647 - Stop converting domains from punycode to unicode (Closed)
Patch Set: Created May 6, 2018, 2:42 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
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 {getDecodedHostname} = require("./url");
23 const {checkWhitelisted} = require("./whitelisting"); 22 const {checkWhitelisted} = require("./whitelisting");
24 const info = require("../buildtools/info"); 23 const info = require("../buildtools/info");
25 24
26 const optionsUrl = "options.html"; 25 const optionsUrl = "options.html";
27 26
28 function findOptionsTab(callback) 27 function findOptionsTab(callback)
29 { 28 {
30 browser.tabs.query({}, tabs => 29 browser.tabs.query({}, tabs =>
31 { 30 {
32 // We find a tab ourselves because Edge has a bug when quering tabs with 31 // We find a tab ourselves because Edge has a bug when quering tabs with
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 showOptions((optionsPage, port) => 206 showOptions((optionsPage, port) =>
208 { 207 {
209 if (!/^https?:$/.test(currentPage.url.protocol)) 208 if (!/^https?:$/.test(currentPage.url.protocol))
210 return; 209 return;
211 210
212 port.postMessage({ 211 port.postMessage({
213 type: "app.respond", 212 type: "app.respond",
214 action: "showPageOptions", 213 action: "showPageOptions",
215 args: [ 214 args: [
216 { 215 {
217 host: getDecodedHostname(currentPage.url).replace(/^www\./, ""), 216 host: currentPage.url.hostname.replace(/^www\./, ""),
Manish Jethani 2018/05/06 18:37:13 Should we also display the encoded hostname in the
Sebastian Noack 2018/05/06 18:47:40 Whatever we do here, it will be inconsistent with
Manish Jethani 2018/05/07 17:03:45 I remember when I was testing ABP on Firefox for A
218 whitelisted: !!checkWhitelisted(currentPage) 217 whitelisted: !!checkWhitelisted(currentPage)
219 } 218 }
220 ] 219 ]
221 }); 220 });
222 }); 221 });
223 }); 222 });
224 }); 223 });
OLDNEW
« lib/csp.js ('K') | « lib/notificationHelper.js ('k') | lib/popupBlocker.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld