| 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 | 
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  160       // Add an element hiding filter for each generated CSS selector |  160       // Add an element hiding filter for each generated CSS selector | 
|  161       for (let selector of selectors) |  161       for (let selector of selectors) | 
|  162         filters.push(docDomain.replace(/^www\./, "") + "##" + selector); |  162         filters.push(docDomain.replace(/^www\./, "") + "##" + selector); | 
|  163     } |  163     } | 
|  164   } |  164   } | 
|  165  |  165  | 
|  166   return {filters, selectors}; |  166   return {filters, selectors}; | 
|  167 } |  167 } | 
|  168  |  168  | 
|  169 let contextMenuItem = { |  169 let contextMenuItem = { | 
|  170   title: chrome.i18n.getMessage("block_element"), |  170   title: browser.i18n.getMessage("block_element"), | 
|  171   contexts: ["image", "video", "audio"], |  171   contexts: ["image", "video", "audio"], | 
|  172   onclick(page) |  172   onclick(page) | 
|  173   { |  173   { | 
|  174     page.sendMessage({type: "composer.content.contextMenuClicked"}); |  174     page.sendMessage({type: "composer.content.contextMenuClicked"}); | 
|  175   } |  175   } | 
|  176 }; |  176 }; | 
|  177  |  177  | 
|  178 function updateContextMenu(page, filter) |  178 function updateContextMenu(page, filter) | 
|  179 { |  179 { | 
|  180   page.contextMenus.remove(contextMenuItem); |  180   page.contextMenus.remove(contextMenuItem); | 
|  181  |  181  | 
|  182   if (typeof filter == "undefined") |  182   if (typeof filter == "undefined") | 
|  183     filter = checkWhitelisted(page); |  183     filter = checkWhitelisted(page); | 
|  184  |  184  | 
|  185   // We don't support the filter composer on Firefox for Android, because the |  185   // We don't support the filter composer on Firefox for Android, because the | 
|  186   // user experience on mobile is quite different. |  186   // user experience on mobile is quite different. | 
|  187   if (info.application != "fennec" && |  187   if (info.application != "fennec" && | 
|  188       !filter && Prefs.shouldShowBlockElementMenu && readyPages.has(page)) |  188       !filter && Prefs.shouldShowBlockElementMenu && readyPages.has(page)) | 
|  189   { |  189   { | 
|  190     page.contextMenus.create(contextMenuItem); |  190     page.contextMenus.create(contextMenuItem); | 
|  191   } |  191   } | 
|  192 } |  192 } | 
|  193  |  193  | 
|  194 FilterNotifier.on("page.WhitelistingStateRevalidate", updateContextMenu); |  194 FilterNotifier.on("page.WhitelistingStateRevalidate", updateContextMenu); | 
|  195  |  195  | 
|  196 Prefs.on("shouldShowBlockElementMenu", () => |  196 Prefs.on("shouldShowBlockElementMenu", () => | 
|  197 { |  197 { | 
|  198   chrome.tabs.query({}, tabs => |  198   browser.tabs.query({}, tabs => | 
|  199   { |  199   { | 
|  200     for (let tab of tabs) |  200     for (let tab of tabs) | 
|  201       updateContextMenu(new ext.Page(tab)); |  201       updateContextMenu(new ext.Page(tab)); | 
|  202   }); |  202   }); | 
|  203 }); |  203 }); | 
|  204  |  204  | 
|  205 port.on("composer.isPageReady", (message, sender) => |  205 port.on("composer.isPageReady", (message, sender) => | 
|  206 { |  206 { | 
|  207   return readyPages.has(new ext.Page({id: message.pageId})); |  207   return readyPages.has(new ext.Page({id: message.pageId})); | 
|  208 }); |  208 }); | 
|  209  |  209  | 
|  210 port.on("composer.ready", (message, sender) => |  210 port.on("composer.ready", (message, sender) => | 
|  211 { |  211 { | 
|  212   readyPages.set(sender.page, null); |  212   readyPages.set(sender.page, null); | 
|  213   updateContextMenu(sender.page); |  213   updateContextMenu(sender.page); | 
|  214 }); |  214 }); | 
|  215  |  215  | 
|  216 port.on("composer.openDialog", (message, sender) => |  216 port.on("composer.openDialog", (message, sender) => | 
|  217 { |  217 { | 
|  218   return new Promise(resolve => |  218   return new Promise(resolve => | 
|  219   { |  219   { | 
|  220     ext.windows.create({ |  220     ext.windows.create({ | 
|  221       url: chrome.extension.getURL("composer.html"), |  221       url: browser.extension.getURL("composer.html"), | 
|  222       left: 50, |  222       left: 50, | 
|  223       top: 50, |  223       top: 50, | 
|  224       width: 420, |  224       width: 420, | 
|  225       height: 200, |  225       height: 200, | 
|  226       type: "popup" |  226       type: "popup" | 
|  227     }, |  227     }, | 
|  228     popupPage => |  228     popupPage => | 
|  229     { |  229     { | 
|  230       let popupPageId = popupPage.id; |  230       let popupPageId = popupPage.id; | 
|  231       function onRemoved(removedPageId) |  231       function onRemoved(removedPageId) | 
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  263  |  263  | 
|  264 port.on("composer.quoteCSS", (message, sender) => |  264 port.on("composer.quoteCSS", (message, sender) => | 
|  265 { |  265 { | 
|  266   return quoteCSS(message.CSS); |  266   return quoteCSS(message.CSS); | 
|  267 }); |  267 }); | 
|  268  |  268  | 
|  269 ext.pages.onLoading.addListener(page => |  269 ext.pages.onLoading.addListener(page => | 
|  270 { |  270 { | 
|  271   page.sendMessage({type: "composer.content.finished"}); |  271   page.sendMessage({type: "composer.content.finished"}); | 
|  272 }); |  272 }); | 
| OLD | NEW |