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

Delta Between Two Patch Sets: popup.js

Issue 29371763: Issue 4795 - Use modern JavaScript syntax (Closed)
Left Patch Set: Fix scoping regression Created Jan. 16, 2017, 9:12 a.m.
Right Patch Set: Addressed some more feedback Created Jan. 18, 2017, 11:44 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 | « options.js ('k') | qunit/common.js » ('j') | no next file with change/comment »
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-2016 Eyeo GmbH 3 * Copyright (C) 2006-2016 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 19
20 let backgroundPage = ext.backgroundPage.getWindow(); 20 const {require} = ext.backgroundPage.getWindow();
21 let require = backgroundPage.require;
22 21
23 let Filter = require("filterClasses").Filter; 22 const {Filter} = require("filterClasses");
24 let FilterStorage = require("filterStorage").FilterStorage; 23 const {FilterStorage} = require("filterStorage");
25 let Prefs = require("prefs").Prefs; 24 const {Prefs} = require("prefs");
26 let checkWhitelisted = require("whitelisting").checkWhitelisted; 25 const {checkWhitelisted} = require("whitelisting");
27 let getDecodedHostname = require("url").getDecodedHostname; 26 const {getDecodedHostname} = require("url");
28 27
29 let page = null; 28 let page = null;
30 29
31 function onLoad() 30 function onLoad()
32 { 31 {
33 ext.pages.query({active: true, lastFocusedWindow: true}, pages => 32 ext.pages.query({active: true, lastFocusedWindow: true}, pages =>
34 { 33 {
35 page = pages[0]; 34 page = pages[0];
36 35
37 // Mark page as 'local' or 'nohtml' to hide non-relevant elements 36 // Mark page as 'local' or 'nohtml' to hide non-relevant elements
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 } 133 }
135 134
136 function toggleCollapse(event) 135 function toggleCollapse(event)
137 { 136 {
138 let collapser = event.currentTarget; 137 let collapser = event.currentTarget;
139 Prefs[collapser.dataset.option] = !Prefs[collapser.dataset.option]; 138 Prefs[collapser.dataset.option] = !Prefs[collapser.dataset.option];
140 collapser.parentNode.classList.toggle("collapsed"); 139 collapser.parentNode.classList.toggle("collapsed");
141 } 140 }
142 141
143 document.addEventListener("DOMContentLoaded", onLoad, false); 142 document.addEventListener("DOMContentLoaded", onLoad, false);
LEFTRIGHT

Powered by Google App Engine
This is Rietveld