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

Delta Between Two Patch Sets: popup.js

Issue 29532767: Issue 5593 - Use messaging in popup for prefs, whitelisting, and stats (Closed) Base URL: https://hg.adblockplus.org/adblockpluschrome/
Left Patch Set: Fix lint error and simplify code Created Sept. 24, 2017, 10:34 p.m.
Right Patch Set: Revert one more instance of ext.pages.open Created Sept. 27, 2017, 9:40 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « popup.html ('k') | skin/popup.css » ('j') | stats.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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 "use strict"; 18 "use strict";
19
20 const {require} = ext.backgroundPage.getWindow();
21 19
22 let tab = null; 20 let tab = null;
23 21
24 function getPref(key, callback) 22 function getPref(key, callback)
25 { 23 {
26 chrome.runtime.sendMessage({type: "prefs.get", key}, callback); 24 chrome.runtime.sendMessage({type: "prefs.get", key}, callback);
27 } 25 }
28 26
29 function togglePref(key, callback) 27 function togglePref(key, callback)
30 { 28 {
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 resolve(); 62 resolve();
65 } 63 }
66 }); 64 });
67 }); 65 });
68 } 66 }
69 67
70 function onLoad() 68 function onLoad()
71 { 69 {
72 chrome.tabs.query({active: true, lastFocusedWindow: true}, tabs => 70 chrome.tabs.query({active: true, lastFocusedWindow: true}, tabs =>
73 { 71 {
74 if (tabs.length > 0) 72 if (tabs.length > 0)
Manish Jethani 2017/09/24 22:37:27 I thought this reads better.
75 tab = {id: tabs[0].id, url: tabs[0].url}; 73 tab = {id: tabs[0].id, url: tabs[0].url};
76 74
77 let urlProtocol = tab && tab.url && new URL(tab.url).protocol; 75 let urlProtocol = tab && tab.url && new URL(tab.url).protocol;
78 76
79 // Mark page as 'local' to hide non-relevant elements 77 // Mark page as 'local' to hide non-relevant elements
80 if (urlProtocol != "http:" && urlProtocol != "https:") 78 if (urlProtocol != "http:" && urlProtocol != "https:")
81 { 79 {
82 document.body.classList.add("local"); 80 document.body.classList.add("local");
83 document.body.classList.remove("nohtml"); 81 document.body.classList.remove("nohtml");
84 } 82 }
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 174
177 function toggleCollapse(event) 175 function toggleCollapse(event)
178 { 176 {
179 let collapser = event.currentTarget; 177 let collapser = event.currentTarget;
180 let collapsible = document.getElementById(collapser.dataset.collapsible); 178 let collapsible = document.getElementById(collapser.dataset.collapsible);
181 collapsible.classList.toggle("collapsed"); 179 collapsible.classList.toggle("collapsed");
182 togglePref(collapser.dataset.option); 180 togglePref(collapser.dataset.option);
183 } 181 }
184 182
185 document.addEventListener("DOMContentLoaded", onLoad, false); 183 document.addEventListener("DOMContentLoaded", onLoad, false);
LEFTRIGHT

Powered by Google App Engine
This is Rietveld