OLD | NEW |
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 | 19 |
20 // We would rather export these properly and then require("./include.preload") | 20 // We would rather export these properly and then require("./include.preload") |
21 // here, but that would result in include.preload running both at pre and post | 21 // here, but that would result in include.preload running both at pre and post |
22 // load. | 22 // load. |
23 const {checkCollapse, elemhide, getURLsFromElement, typeMap} = window; | 23 const {checkCollapse, contentFiltering, getURLsFromElement, typeMap} = window; |
24 | 24 |
25 // The page ID for the popup filter selection dialog (top frame only). | 25 // The page ID for the popup filter selection dialog (top frame only). |
26 let blockelementPopupId = null; | 26 let blockelementPopupId = null; |
27 | 27 |
28 // Element picking state (top frame only). | 28 // Element picking state (top frame only). |
29 let currentlyPickingElement = false; | 29 let currentlyPickingElement = false; |
30 let lastMouseOverEvent = null; | 30 let lastMouseOverEvent = null; |
31 | 31 |
32 // During element picking this is the currently highlighted element. When | 32 // During element picking this is the currently highlighted element. When |
33 // element has been picked this is the element that is due to be blocked. | 33 // element has been picked this is the element that is due to be blocked. |
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
536 if (currentElement && message.remove) | 536 if (currentElement && message.remove) |
537 { | 537 { |
538 // Hide the selected element itself if an added blocking | 538 // Hide the selected element itself if an added blocking |
539 // filter is causing it to collapse. Note that this | 539 // filter is causing it to collapse. Note that this |
540 // behavior is incomplete, but the best we can do here, | 540 // behavior is incomplete, but the best we can do here, |
541 // e.g. if an added blocking filter matches other elements, | 541 // e.g. if an added blocking filter matches other elements, |
542 // the effect won't be visible until the page is is reloaded. | 542 // the effect won't be visible until the page is is reloaded. |
543 checkCollapse(currentElement.prisoner || currentElement); | 543 checkCollapse(currentElement.prisoner || currentElement); |
544 | 544 |
545 // Apply added element hiding filters. | 545 // Apply added element hiding filters. |
546 elemhide.apply(); | 546 contentFiltering.apply({elemhide: true}); |
547 } | 547 } |
548 deactivateBlockElement(!!message.popupAlreadyClosed); | 548 deactivateBlockElement(!!message.popupAlreadyClosed); |
549 break; | 549 break; |
550 case "composer.content.clearPreviousRightClickEvent": | 550 case "composer.content.clearPreviousRightClickEvent": |
551 if (!lastRightClickEventIsMostRecent) | 551 if (!lastRightClickEventIsMostRecent) |
552 lastRightClickEvent = null; | 552 lastRightClickEvent = null; |
553 lastRightClickEventIsMostRecent = false; | 553 lastRightClickEventIsMostRecent = false; |
554 break; | 554 break; |
555 case "composer.content.dialogOpened": | 555 case "composer.content.dialogOpened": |
556 if (window == window.top) | 556 if (window == window.top) |
(...skipping 26 matching lines...) Expand all Loading... |
583 if (document instanceof HTMLDocument) | 583 if (document instanceof HTMLDocument) |
584 { | 584 { |
585 // There's a bug in Firefox that causes document_end content scripts to run | 585 // There's a bug in Firefox that causes document_end content scripts to run |
586 // before document_start content scripts on extension startup. In this case | 586 // before document_start content scripts on extension startup. In this case |
587 // the ext object is undefined, we fail to initialize, and initializeComposer | 587 // the ext object is undefined, we fail to initialize, and initializeComposer |
588 // returns false. As a workaround, try again after a timeout. | 588 // returns false. As a workaround, try again after a timeout. |
589 // https://bugzilla.mozilla.org/show_bug.cgi?id=1395287 | 589 // https://bugzilla.mozilla.org/show_bug.cgi?id=1395287 |
590 if (!initializeComposer()) | 590 if (!initializeComposer()) |
591 setTimeout(initializeComposer, 2000); | 591 setTimeout(initializeComposer, 2000); |
592 } | 592 } |
OLD | NEW |