Delta Between Two Patch Sets: composer.postload.js
Issue 29374674:
Issue 4864 - Start using ESLint for adblockpluschrome (Closed)
Left Patch Set: Reduce inline eslint-disable comments
Created Feb. 8, 2017, 7:27 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.
« 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') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 65 function getBlockableElementOrAncestor(element, callback) | 65 function getBlockableElementOrAncestor(element, callback) |
| 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 { | |
| 76 element = element.parentElement; | 75 element = element.parentElement; |
| 77 } | 76 |
| 78 // 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. |
| 79 // 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. |
| 80 else if (element.localName == "map") | 79 else if (element.localName == "map") |
| 81 { | 80 { |
| 82 let images = document.querySelectorAll("img[usemap]"); | 81 let images = document.querySelectorAll("img[usemap]"); |
| 83 let image = null; | 82 let image = null; |
| 84 | 83 |
| 85 for (let currentImage of images) | 84 for (let currentImage of images) |
| 86 { | 85 { |
| 87 let usemap = currentImage.getAttribute("usemap"); | 86 let usemap = currentImage.getAttribute("usemap"); |
| (...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 571 } | 570 } |
| 572 }); | 571 }); |
| 573 } | 572 } |
| 574 break; | 573 break; |
| 575 } | 574 } |
| 576 }); | 575 }); |
| 577 | 576 |
| 578 if (window == window.top) | 577 if (window == window.top) |
| 579 ext.backgroundPage.sendMessage({type: "composer.ready"}); | 578 ext.backgroundPage.sendMessage({type: "composer.ready"}); |
| 580 } | 579 } |
| LEFT | RIGHT |
« composer.js ('k')
|
ext/background.js » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
