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

Delta Between Two Patch Sets: composer.postload.js

Issue 29374674: Issue 4864 - Start using ESLint for adblockpluschrome (Closed)
Left Patch Set: Addressed some of Sebastian's feedback, made other improvements Created Feb. 20, 2017, 10:06 a.m.
Right Patch Set: Use .includes again Created March 31, 2017, 8:37 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 | « composer.js ('k') | ext/background.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-2017 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 /* globals checkCollapse, elemhide, getURLsFromElement, typeMap */ 18 /* globals checkCollapse, elemhide, getURLsFromElement, typeMap */
19 19
20 "use strict"; 20 "use strict";
21 21
22 // The page ID for the popup filter selection dialog (top frame only). 22 // The page ID for the popup filter selection dialog (top frame only).
23 let blockelementPopupId = null; 23 let blockelementPopupId = null;
24 24
25 // Element picking state (top frame only). 25 // Element picking state (top frame only).
26 let currentlyPickingElement = false; 26 let currentlyPickingElement = false;
27 let lastMouseOverEvent = null; 27 let lastMouseOverEvent = null;
28 28
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 { 66 {
67 // We assume that the user doesn't want to block the whole page. 67 // We assume that the user doesn't want to block the whole page.
68 // So we never consider the <html> or <body> element. 68 // So we never consider the <html> or <body> element.
69 while (element && element != document.documentElement && 69 while (element && element != document.documentElement &&
70 element != document.body) 70 element != document.body)
71 { 71 {
72 // We can't handle non-HTML (like SVG) elements, as well as 72 // We can't handle non-HTML (like SVG) elements, as well as
73 // <area> elements (see below). So fall back to the parent element. 73 // <area> elements (see below). So fall back to the parent element.
74 if (!(element instanceof HTMLElement) || element.localName == "area") 74 if (!(element instanceof HTMLElement) || element.localName == "area")
75 element = element.parentElement; 75 element = element.parentElement;
76
76 // If image maps are used mouse events occur for the <area> element. 77 // If image maps are used mouse events occur for the <area> element.
77 // But we have to block the image associated with the <map> element. 78 // But we have to block the image associated with the <map> element.
78 else if (element.localName == "map") 79 else if (element.localName == "map")
79 { 80 {
80 let images = document.querySelectorAll("img[usemap]"); 81 let images = document.querySelectorAll("img[usemap]");
81 let image = null; 82 let image = null;
82 83
83 for (let currentImage of images) 84 for (let currentImage of images)
84 { 85 {
85 let usemap = currentImage.getAttribute("usemap"); 86 let usemap = currentImage.getAttribute("usemap");
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 { 396 {
396 ext.backgroundPage.sendMessage({ 397 ext.backgroundPage.sendMessage({
397 type: "forward", 398 type: "forward",
398 targetPageId: popupId, 399 targetPageId: popupId,
399 payload: {type: "composer.dialog.init", filters} 400 payload: {type: "composer.dialog.init", filters}
400 }); 401 });
401 402
402 // Only the top frame keeps a record of the popup window's ID, 403 // Only the top frame keeps a record of the popup window's ID,
403 // so if this isn't the top frame we need to pass the ID on. 404 // so if this isn't the top frame we need to pass the ID on.
404 if (window == window.top) 405 if (window == window.top)
406 {
405 blockelementPopupId = popupId; 407 blockelementPopupId = popupId;
408 }
406 else 409 else
407 { 410 {
408 ext.backgroundPage.sendMessage({ 411 ext.backgroundPage.sendMessage({
409 type: "forward", 412 type: "forward",
410 payload: {type: "composer.content.dialogOpened", popupId} 413 payload: {type: "composer.content.dialogOpened", popupId}
411 }); 414 });
412 } 415 }
413 }); 416 });
414 417
415 if (selectors.length > 0) 418 if (selectors.length > 0)
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 } 570 }
568 }); 571 });
569 } 572 }
570 break; 573 break;
571 } 574 }
572 }); 575 });
573 576
574 if (window == window.top) 577 if (window == window.top)
575 ext.backgroundPage.sendMessage({type: "composer.ready"}); 578 ext.backgroundPage.sendMessage({type: "composer.ready"});
576 } 579 }
LEFTRIGHT
« composer.js ('k') | ext/background.js » ('j') | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld