OLD | NEW |
1 /* | 1 /* |
2 * This file is part of Adblock Plus <http://adblockplus.org/>, | 2 * This file is part of Adblock Plus <http://adblockplus.org/>, |
3 * Copyright (C) 2006-2013 Eyeo GmbH | 3 * Copyright (C) 2006-2013 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 var backgroundPage = ext.backgroundPage.getWindow(); | 18 var backgroundPage = ext.backgroundPage.getWindow(); |
19 var imports = ["require", "extractHostFromURL", "refreshIconAndContextMenu", "op
enOptions"]; | 19 var imports = ["require", "extractHostFromURL", "openOptions"]; |
20 for (var i = 0; i < imports.length; i++) | 20 for (var i = 0; i < imports.length; i++) |
21 window[imports[i]] = backgroundPage[imports[i]]; | 21 window[imports[i]] = backgroundPage[imports[i]]; |
22 | 22 |
23 var Filter = require("filterClasses").Filter; | 23 var Filter = require("filterClasses").Filter; |
24 var FilterStorage = require("filterStorage").FilterStorage; | 24 var FilterStorage = require("filterStorage").FilterStorage; |
25 var Prefs = require("prefs").Prefs; | 25 var Prefs = require("prefs").Prefs; |
26 var isWhitelisted = require("whitelisting").isWhitelisted; | 26 var isWhitelisted = require("whitelisting").isWhitelisted; |
27 | 27 |
28 var tab = null; | 28 var tab = null; |
29 | 29 |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
101 // Remove any exception rules applying to this URL | 101 // Remove any exception rules applying to this URL |
102 var filter = isWhitelisted(tab.url); | 102 var filter = isWhitelisted(tab.url); |
103 while (filter) | 103 while (filter) |
104 { | 104 { |
105 FilterStorage.removeFilter(filter); | 105 FilterStorage.removeFilter(filter); |
106 if (filter.subscriptions.length) | 106 if (filter.subscriptions.length) |
107 filter.disabled = true; | 107 filter.disabled = true; |
108 filter = isWhitelisted(tab.url); | 108 filter = isWhitelisted(tab.url); |
109 } | 109 } |
110 } | 110 } |
111 | |
112 refreshIconAndContextMenu(tab); | |
113 } | 111 } |
114 | 112 |
115 function activateClickHide() | 113 function activateClickHide() |
116 { | 114 { |
117 document.body.classList.add("clickhide-active"); | 115 document.body.classList.add("clickhide-active"); |
118 tab.sendMessage({type: "clickhide-activate"}); | 116 tab.sendMessage({type: "clickhide-activate"}); |
119 | 117 |
120 // Close the popup after a few seconds, so user doesn't have to | 118 // Close the popup after a few seconds, so user doesn't have to |
121 activateClickHide.timeout = window.setTimeout(ext.closePopup, 5000); | 119 activateClickHide.timeout = window.setTimeout(ext.closePopup, 5000); |
122 } | 120 } |
123 | 121 |
124 function cancelClickHide() | 122 function cancelClickHide() |
125 { | 123 { |
126 if (activateClickHide.timeout) | 124 if (activateClickHide.timeout) |
127 { | 125 { |
128 window.clearTimeout(activateClickHide.timeout); | 126 window.clearTimeout(activateClickHide.timeout); |
129 activateClickHide.timeout = null; | 127 activateClickHide.timeout = null; |
130 } | 128 } |
131 document.body.classList.remove("clickhide-active"); | 129 document.body.classList.remove("clickhide-active"); |
132 tab.sendMessage({type: "clickhide-deactivate"}); | 130 tab.sendMessage({type: "clickhide-deactivate"}); |
133 } | 131 } |
134 | 132 |
135 function toggleCollapse(event) | 133 function toggleCollapse(event) |
136 { | 134 { |
137 var collapser = event.currentTarget; | 135 var collapser = event.currentTarget; |
138 Prefs[collapser.dataset.option] = !Prefs[collapser.dataset.option]; | 136 Prefs[collapser.dataset.option] = !Prefs[collapser.dataset.option]; |
139 collapser.parentNode.classList.toggle("collapsed"); | 137 collapser.parentNode.classList.toggle("collapsed"); |
140 } | 138 } |
OLD | NEW |