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

Side by Side Diff: options.js

Issue 29339314: Issue 3870 - Rewrite legacy options page to use async messages (Closed)
Patch Set: Addressed initial feedback Created April 3, 2016, 3:48 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « lib/notificationHelper.js ('k') | safari/ext/background.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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-2016 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 "use strict";
19 var require = backgroundPage.require;
20 19
21 with(require("filterClasses")) 20 /**
21 * Creates a wrapping function used to conveniently send a type of message.
22 *
23 * @param {Object} baseMessage The part of the message that's always sent
24 * @param {..string} paramKeys Any message keys that have dynamic values. The
25 * returned function will take the corresponding
26 * values as arguments.
27 * @return The generated messaging function, optionally taking any values as
28 * specified by the paramKeys and finally an optional callback.
29 * (Although the value arguments are optional their index must be
30 * maintained. E.g. if you omit the first value you must omit the
31 * second too.)
32 */
33 function wrapper(baseMessage /* , [paramKeys] */)
22 { 34 {
23 this.Filter = Filter; 35 var paramKeys = [];
24 this.WhitelistFilter = WhitelistFilter; 36 for (var i = 1; i < arguments.length; i++)
37 paramKeys.push(arguments[i]);
38
39 return function(/* [paramValues], callback */)
40 {
41 var message = Object.create(null);
42 for (var key in baseMessage)
43 if (baseMessage.hasOwnProperty(key))
44 message[key] = baseMessage[key];
45
46 var paramValues = [];
47 var callback;
48
49 if (arguments.length > 0)
50 {
51 var lastArg = arguments[arguments.length - 1];
52 if (typeof lastArg == "function")
53 callback = lastArg;
54
55 for (var i = 0; i < arguments.length - (callback ? 1 : 0); i++)
56 message[paramKeys[i]] = arguments[i];
57 }
58
59 ext.backgroundPage.sendMessage(message, callback);
60 };
25 } 61 }
26 with(require("subscriptionClasses"))
27 {
28 this.Subscription = Subscription;
29 this.SpecialSubscription = SpecialSubscription;
30 this.DownloadableSubscription = DownloadableSubscription;
31 }
32 with(require("filterValidation"))
33 {
34 this.parseFilter = parseFilter;
35 this.parseFilters = parseFilters;
36 }
37 var FilterStorage = require("filterStorage").FilterStorage;
38 var FilterNotifier = require("filterNotifier").FilterNotifier;
39 var Prefs = require("prefs").Prefs;
40 var Synchronizer = require("synchronizer").Synchronizer;
41 var Utils = require("utils").Utils;
42 var NotificationStorage = require("notification").Notification;
43 var info = require("info");
44 62
45 // Loads options from localStorage and sets UI elements accordingly 63 var getDocLink = wrapper({type: "app.get", what: "doclink"}, "link");
64 var getInfo = wrapper({type: "app.get"}, "what");
65 var getPref = wrapper({type: "prefs.get"}, "key");
66 var togglePref = wrapper({type: "prefs.toggle"}, "key");
67 var getSubscriptions = wrapper({type: "subscriptions.get"},
68 "downloadable", "special");
69 var removeSubscription = wrapper({type: "subscriptions.remove"}, "url");
70 var addSubscription = wrapper({type: "subscriptions.add"},
71 "url", "title", "homepage");
72 var toggleSubscription = wrapper({type: "subscriptions.toggle"},
73 "url", "keepInstalled");
74 var updateSubscription = wrapper({type: "subscriptions.update"}, "url");
75 var isSubscriptionDownloading = wrapper({type: "subscriptions.isDownloading"},
76 "url");
77 var importRawFilters = wrapper({type: "filters.importRaw"}, "text");
78 var addFilter = wrapper({type: "filters.add"}, "text");
79 var getFilters = wrapper({type: "filters.get"}, "subscriptionUrl");
80 var removeFilter = wrapper({type: "filters.remove"}, "text");
81
82 var i18n = ext.i18n;
83 var whitelistedDomainRegexp = /^@@\|\|([^\/:]+)\^\$document$/;
84 var delayedSubscriptionSelection = null;
85
86 // Loads options and sets UI elements accordingly
46 function loadOptions() 87 function loadOptions()
47 { 88 {
48 // Set page title to i18n version of "Adblock Plus Options" 89 // Set page title to i18n version of "Adblock Plus Options"
49 document.title = i18n.getMessage("options"); 90 document.title = i18n.getMessage("options");
50 91
51 // Set links 92 // Set links
52 $("#acceptableAdsLink").attr("href", Prefs.subscriptions_exceptionsurl); 93 getPref("subscriptions_exceptionsurl", function (url)
53 $("#acceptableAdsDocs").attr("href", Utils.getDocLink("acceptable_ads")); 94 {
54 setLinks("filter-must-follow-syntax", Utils.getDocLink("filterdoc")); 95 $("#acceptableAdsLink").attr("href", url);
55 setLinks("found-a-bug", Utils.getDocLink(info.application + "_support")); 96 });
97 getDocLink("acceptable_ads", function (url)
98 {
99 $("#acceptableAdsDocs").attr("href", url);
100 });
101 getDocLink("filterdoc", function (url)
102 {
103 setLinks("filter-must-follow-syntax", url);
104 });
105 getInfo("application", function (application)
106 {
107 getInfo("platform", function (platform)
108 {
109 if (platform == "chromium" && application != "opera")
110 application = "chrome";
111
112 getDocLink(application + "_support", function (url)
113 {
114 setLinks("found-a-bug", url);
115 });
116 });
117 });
56 118
57 // Add event listeners 119 // Add event listeners
58 window.addEventListener("unload", unloadOptions, false);
59 $("#updateFilterLists").click(updateFilterLists); 120 $("#updateFilterLists").click(updateFilterLists);
60 $("#startSubscriptionSelection").click(startSubscriptionSelection); 121 $("#startSubscriptionSelection").click(startSubscriptionSelection);
61 $("#subscriptionSelector").change(updateSubscriptionSelection); 122 $("#subscriptionSelector").change(updateSubscriptionSelection);
62 $("#addSubscription").click(addSubscription); 123 $("#addSubscription").click(addSubscriptionClicked);
63 $("#acceptableAds").click(allowAcceptableAds); 124 $("#acceptableAds").click(toggleAcceptableAds);
64 $("#whitelistForm").submit(addWhitelistDomain); 125 $("#whitelistForm").submit(addWhitelistDomain);
65 $("#removeWhitelist").click(removeSelectedExcludedDomain); 126 $("#removeWhitelist").click(removeSelectedExcludedDomain);
66 $("#customFilterForm").submit(addTypedFilter); 127 $("#customFilterForm").submit(addTypedFilter);
67 $("#removeCustomFilter").click(removeSelectedFilters); 128 $("#removeCustomFilter").click(removeSelectedFilters);
68 $("#rawFiltersButton").click(toggleFiltersInRawFormat); 129 $("#rawFiltersButton").click(toggleFiltersInRawFormat);
69 $("#importRawFilters").click(importRawFiltersText); 130 $("#importRawFilters").click(importRawFiltersText);
70 131
71 FilterNotifier.on("load", reloadFilters);
72 FilterNotifier.on("subscription.title", onSubscriptionChange);
73 FilterNotifier.on("subscription.disabled", onSubscriptionChange);
74 FilterNotifier.on("subscription.homepage", onSubscriptionChange);
75 FilterNotifier.on("subscription.lastDownload", onSubscriptionChange);
76 FilterNotifier.on("subscription.downloadStatus", onSubscriptionChange);
77 FilterNotifier.on("subscription.added", onSubscriptionAdded);
78 FilterNotifier.on("subscription.removed", onSubscriptionRemoved);
79 FilterNotifier.on("filter.added", onFilterAdded);
80 FilterNotifier.on("filter.removed", onFilterRemoved);
81
82 // Display jQuery UI elements 132 // Display jQuery UI elements
83 $("#tabs").tabs(); 133 $("#tabs").tabs();
84 $("button").button(); 134 $("button").button();
85 $(".refreshButton").button("option", "icons", {primary: "ui-icon-refresh"}); 135 $(".refreshButton").button("option", "icons", {primary: "ui-icon-refresh"});
86 $(".addButton").button("option", "icons", {primary: "ui-icon-plus"}); 136 $(".addButton").button("option", "icons", {primary: "ui-icon-plus"});
87 $(".removeButton").button("option", "icons", {primary: "ui-icon-minus"}); 137 $(".removeButton").button("option", "icons", {primary: "ui-icon-minus"});
88 138
89 // Popuplate option checkboxes 139 // Popuplate option checkboxes
90 initCheckbox("shouldShowBlockElementMenu"); 140 initCheckbox("shouldShowBlockElementMenu");
91 initCheckbox("show_devtools_panel"); 141 initCheckbox("show_devtools_panel");
92 initCheckbox("shouldShowNotifications", { 142 initCheckbox("shouldShowNotifications", {
93 get: function() 143 key: "notifications_ignoredcategories",
144 get: function(ignoredcategories)
94 { 145 {
95 return Prefs.notifications_ignoredcategories.indexOf("*") == -1; 146 return ignoredcategories.indexOf("*") == -1;
96 },
97 toggle: function()
98 {
99 NotificationStorage.toggleIgnoreCategory("*");
100 return this.get();
101 } 147 }
102 }); 148 });
103 149
104 if (info.platform != "chromium") 150 getInfo("features", function(features)
105 document.getElementById("showDevtoolsPanelContainer").hidden = true; 151 {
106 if (!Prefs.notifications_showui) 152 if (!features.devToolsPanel)
107 document.getElementById("shouldShowNotificationsContainer").hidden = true; 153 document.getElementById("showDevtoolsPanelContainer").hidden = true;
154 });
155 getPref("notifications_showui", function (notifications_showui)
156 {
157 if (!notifications_showui)
158 document.getElementById("shouldShowNotificationsContainer").hidden = true;
159 });
108 160
109 ext.onMessage.addListener(onMessage); 161 // Register listeners in the background message responder
110 ext.backgroundPage.sendMessage({ 162 ext.backgroundPage.sendMessage({
111 type: "app.listen", 163 type: "app.listen",
112 filter: ["addSubscription"] 164 filter: ["addSubscription", "switchToOptionsSection"]
165 });
166 ext.backgroundPage.sendMessage(
167 {
168 type: "filters.listen",
169 filter: ["added", "loaded", "removed"]
170 });
171 ext.backgroundPage.sendMessage(
172 {
173 type: "prefs.listen",
174 filter: ["notifications_ignoredcategories", "notifications_showui",
175 "safari_contentblocker", "show_devtools_panel",
176 "shouldShowBlockElementMenu"]
177 });
178 ext.backgroundPage.sendMessage(
179 {
180 type: "subscriptions.listen",
181 filter: ["added", "disabled", "homepage", "lastDownload", "removed",
182 "title"]
113 }); 183 });
114 184
115 // Load recommended subscriptions 185 // Load recommended subscriptions
116 loadRecommendations(); 186 loadRecommendations();
117 187
118 // Show user's filters 188 // Show user's filters
119 reloadFilters(); 189 reloadFilters();
120 } 190 }
121 $(loadOptions); 191 $(loadOptions);
122 192
123 function onMessage(msg)
124 {
125 if (msg.type == "app.listen")
126 {
127 if (msg.action == "addSubscription")
128 {
129 var subscription = msg.args[0];
130 startSubscriptionSelection(subscription.title, subscription.url);
131 }
132 }
133 else if (msg.type == "focus-section")
134 {
135 var tabs = document.getElementsByClassName("ui-tabs-panel");
136 for (var i = 0; i < tabs.length; i++)
137 {
138 var found = tabs[i].querySelector("[data-section='" + msg.section + "']");
139 if (!found)
140 continue;
141
142 var previous = document.getElementsByClassName("focused");
143 if (previous.length > 0)
144 previous[0].classList.remove("focused");
145
146 var tab = $("[href='#" + tabs[i].id + "']");
147 $("#tabs").tabs("select", tab.parent().index());
148 found.classList.add("focused");
149 }
150 }
151 };
152
153 // Reloads the displayed subscriptions and filters 193 // Reloads the displayed subscriptions and filters
154 function reloadFilters() 194 function reloadFilters()
155 { 195 {
156 // Load user filter URLs 196 // Load user filter URLs
157 var container = document.getElementById("filterLists"); 197 var container = document.getElementById("filterLists");
158 while (container.lastChild) 198 while (container.lastChild)
159 container.removeChild(container.lastChild); 199 container.removeChild(container.lastChild);
160 200
161 var hasAcceptable = false; 201 getPref("subscriptions_exceptionsurl", function (acceptableAdsUrl)
162 for (var i = 0; i < FilterStorage.subscriptions.length; i++)
163 { 202 {
164 var subscription = FilterStorage.subscriptions[i]; 203 getSubscriptions(true, false, function(subscriptions)
165 if (subscription instanceof SpecialSubscription)
166 continue;
167
168 if (subscription.url == Prefs.subscriptions_exceptionsurl)
169 { 204 {
170 hasAcceptable = true; 205 for (var i = 0; i < subscriptions.length; i++)
171 continue; 206 {
172 } 207 var subscription = subscriptions[i];
173 208 if (subscription.url == acceptableAdsUrl)
174 addSubscriptionEntry(subscription); 209 $("#acceptableAds").prop("checked", !subscription.disabled);
175 } 210 else
176 211 addSubscriptionEntry(subscription);
177 $("#acceptableAds").prop("checked", hasAcceptable); 212 }
213 });
214 });
178 215
179 // User-entered filters 216 // User-entered filters
180 var userFilters = backgroundPage.getUserFilters(); 217 getSubscriptions(false, true, function(subscriptions)
181 populateList("userFiltersBox", userFilters.filters); 218 {
182 populateList("excludedDomainsBox", userFilters.exceptions); 219 clearListBox("userFiltersBox");
183 } 220 clearListBox("excludedDomainsBox");
184 221
185 // Cleans up when the options window is closed 222 for (var i = 0; i < subscriptions.length; i++)
186 function unloadOptions() 223 getFilters(subscriptions[i].url, function(filters)
187 { 224 {
188 FilterNotifier.off("load", reloadFilters); 225 for (var j = 0; j < filters.length; j++)
189 FilterNotifier.off("subscription.title", onSubscriptionChange); 226 {
190 FilterNotifier.off("subscription.disabled", onSubscriptionChange); 227 var filter = filters[j].text;
191 FilterNotifier.off("subscription.homepage", onSubscriptionChange); 228 if (whitelistedDomainRegexp.test(filter))
192 FilterNotifier.off("subscription.lastDownload", onSubscriptionChange); 229 appendToListBox("excludedDomainsBox", RegExp.$1);
193 FilterNotifier.off("subscription.downloadStatus", onSubscriptionChange); 230 else
194 FilterNotifier.off("subscription.added", onSubscriptionAdded); 231 appendToListBox("userFiltersBox", filter);
195 FilterNotifier.off("subscription.removed", onSubscriptionRemoved); 232 }
196 FilterNotifier.off("filter.added", onFilterAdded); 233 });
197 FilterNotifier.off("filter.removed", onFilterRemoved); 234 });
198 } 235 }
199 236
200 function initCheckbox(id, descriptor) 237 function initCheckbox(id, descriptor)
201 { 238 {
202 var checkbox = document.getElementById(id); 239 var checkbox = document.getElementById(id);
203 if (descriptor && descriptor.get) 240 var key = descriptor && descriptor.key || id;
204 checkbox.checked = descriptor.get(); 241 getPref(key, function (value)
205 else 242 {
206 checkbox.checked = Prefs[id]; 243 if (descriptor && descriptor.get)
244 checkbox.checked = descriptor.get(value);
245 else
246 checkbox.checked = value;
247 });
207 248
208 checkbox.addEventListener("click", function() 249 checkbox.addEventListener("click", function()
209 { 250 {
210 if (descriptor && descriptor.toggle) 251 if (descriptor && descriptor.toggle)
211 checkbox.checked = descriptor.toggle(); 252 checkbox.checked = descriptor.toggle();
212 253 togglePref(key);
213 Prefs[id] = checkbox.checked;
214 }, false); 254 }, false);
215 } 255 }
216 256
217 var delayedSubscriptionSelection = null;
218
219 function loadRecommendations() 257 function loadRecommendations()
220 { 258 {
221 fetch("subscriptions.xml") 259 fetch("subscriptions.xml")
222 .then(function(response) 260 .then(function(response)
223 { 261 {
224 return response.text(); 262 return response.text();
225 }) 263 })
226 .then(function(text) 264 .then(function(text)
227 { 265 {
228 var selectedIndex = 0; 266 var selectedIndex = 0;
229 var selectedPrefix = null; 267 var selectedPrefix = null;
230 var matchCount = 0; 268 var matchCount = 0;
231 269
232 var list = document.getElementById("subscriptionSelector"); 270 var list = document.getElementById("subscriptionSelector");
233 var doc = new DOMParser().parseFromString(text, "application/xml"); 271 var doc = new DOMParser().parseFromString(text, "application/xml");
234 var elements = doc.documentElement.getElementsByTagName("subscription"); 272 var elements = doc.documentElement.getElementsByTagName("subscription");
235 273
236 for (var i = 0; i < elements.length; i++) 274 for (var i = 0; i < elements.length; i++)
237 { 275 {
238 var element = elements[i]; 276 var element = elements[i];
239 var option = new Option(); 277 var option = new Option();
240 option.text = element.getAttribute("title") + " (" + 278 option.text = element.getAttribute("title") + " (" +
241 element.getAttribute("specialization") + ")"; 279 element.getAttribute("specialization") + ")";
242 option._data = { 280 option._data = {
243 title: element.getAttribute("title"), 281 title: element.getAttribute("title"),
244 url: element.getAttribute("url"), 282 url: element.getAttribute("url"),
245 homepage: element.getAttribute("homepage") 283 homepage: element.getAttribute("homepage")
246 }; 284 };
247 285
248 var prefixes = element.getAttribute("prefixes"); 286 var prefix = element.getAttribute("prefixes");
249 var prefix = Utils.checkLocalePrefixMatch(prefixes);
250 if (prefix) 287 if (prefix)
251 { 288 {
289 prefix = prefix.replace(/\W/g, "_");
252 option.style.fontWeight = "bold"; 290 option.style.fontWeight = "bold";
253 option.style.backgroundColor = "#E0FFE0"; 291 option.style.backgroundColor = "#E0FFE0";
254 option.style.color = "#000000"; 292 option.style.color = "#000000";
255 if (!selectedPrefix || selectedPrefix.length < prefix.length) 293 if (!selectedPrefix || selectedPrefix.length < prefix.length)
256 { 294 {
257 selectedIndex = i; 295 selectedIndex = i;
258 selectedPrefix = prefix; 296 selectedPrefix = prefix;
259 matchCount = 1; 297 matchCount = 1;
260 } 298 }
261 else if (selectedPrefix && selectedPrefix.length == prefix.length) 299 else if (selectedPrefix && selectedPrefix.length == prefix.length)
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 var data = list.options[list.selectedIndex]._data; 356 var data = list.options[list.selectedIndex]._data;
319 if (data) 357 if (data)
320 $("#customSubscriptionContainer").hide(); 358 $("#customSubscriptionContainer").hide();
321 else 359 else
322 { 360 {
323 $("#customSubscriptionContainer").show(); 361 $("#customSubscriptionContainer").show();
324 $("#customSubscriptionTitle").focus(); 362 $("#customSubscriptionTitle").focus();
325 } 363 }
326 } 364 }
327 365
328 function addSubscription() 366 function addSubscriptionClicked()
329 { 367 {
330 var list = document.getElementById("subscriptionSelector"); 368 var list = document.getElementById("subscriptionSelector");
331 var data = list.options[list.selectedIndex]._data; 369 var data = list.options[list.selectedIndex]._data;
332 if (data) 370 if (data)
333 doAddSubscription(data.url, data.title, data.homepage); 371 addSubscription(data.url, data.title, data.homepage);
334 else 372 else
335 { 373 {
336 var url = document.getElementById("customSubscriptionLocation").value.trim() ; 374 var url = document.getElementById("customSubscriptionLocation").value.trim() ;
337 if (!/^https?:/i.test(url)) 375 if (!/^https?:/i.test(url))
338 { 376 {
339 alert(i18n.getMessage("global_subscription_invalid_location")); 377 alert(i18n.getMessage("global_subscription_invalid_location"));
340 $("#customSubscriptionLocation").focus(); 378 $("#customSubscriptionLocation").focus();
341 return; 379 return;
342 } 380 }
343 381
344 var title = document.getElementById("customSubscriptionTitle").value.trim(); 382 var title = document.getElementById("customSubscriptionTitle").value.trim();
345 if (!title) 383 if (!title)
346 title = url; 384 title = url;
347 385
348 doAddSubscription(url, title, null); 386 addSubscription(url, title, null);
349 } 387 }
350 388
351 $("#addSubscriptionContainer").hide(); 389 $("#addSubscriptionContainer").hide();
352 $("#customSubscriptionContainer").hide(); 390 $("#customSubscriptionContainer").hide();
353 $("#addSubscriptionButton").show(); 391 $("#addSubscriptionButton").show();
354 } 392 }
355 393
356 function doAddSubscription(url, title, homepage) 394 function toggleAcceptableAds()
357 { 395 {
358 if (url in FilterStorage.knownSubscriptions) 396 getPref("subscriptions_exceptionsurl", function (url)
359 return;
360
361 var subscription = Subscription.fromURL(url);
362 if (!subscription)
363 return;
364
365 subscription.title = title;
366 if (homepage)
367 subscription.homepage = homepage;
368 FilterStorage.addSubscription(subscription);
369
370 if (subscription instanceof DownloadableSubscription && !subscription.lastDown load)
371 Synchronizer.execute(subscription);
372 }
373
374 function allowAcceptableAds(event)
375 {
376 var subscription = Subscription.fromURL(Prefs.subscriptions_exceptionsurl);
377 if (!subscription)
378 return;
379
380 subscription.disabled = false;
381 subscription.title = "Allow non-intrusive advertising";
382 if ($("#acceptableAds").prop("checked"))
383 { 397 {
384 FilterStorage.addSubscription(subscription); 398 toggleSubscription(url, true);
385 if (subscription instanceof DownloadableSubscription && !subscription.lastDo wnload) 399 });
386 Synchronizer.execute(subscription);
387 }
388 else
389 FilterStorage.removeSubscription(subscription);
390 } 400 }
391 401
392 function findSubscriptionElement(subscription) 402 function findSubscriptionElement(subscription)
393 { 403 {
394 var children = document.getElementById("filterLists").childNodes; 404 var children = document.getElementById("filterLists").childNodes;
395 for (var i = 0; i < children.length; i++) 405 for (var i = 0; i < children.length; i++)
396 if (children[i]._subscription == subscription) 406 if (children[i]._subscription.url == subscription.url)
397 return children[i]; 407 return children[i];
398 return null; 408 return null;
399 } 409 }
400 410
401 function updateSubscriptionInfo(element) 411 function updateSubscriptionInfo(element, subscription)
402 { 412 {
403 var subscription = element._subscription; 413 if (subscription)
414 element._subscription = subscription;
415 else
416 subscription = element._subscription;
404 417
405 var title = element.getElementsByClassName("subscriptionTitle")[0]; 418 var title = element.getElementsByClassName("subscriptionTitle")[0];
406 title.textContent = subscription.title; 419 title.textContent = subscription.title;
407 title.setAttribute("title", subscription.url); 420 title.setAttribute("title", subscription.url);
408 if (subscription.homepage) 421 if (subscription.homepage)
409 title.href = subscription.homepage; 422 title.href = subscription.homepage;
410 else 423 else
411 title.href = subscription.url; 424 title.href = subscription.url;
412 425
413 var enabled = element.getElementsByClassName("subscriptionEnabled")[0]; 426 var enabled = element.getElementsByClassName("subscriptionEnabled")[0];
414 enabled.checked = !subscription.disabled; 427 enabled.checked = !subscription.disabled;
415 428
416 var lastUpdate = element.getElementsByClassName("subscriptionUpdate")[0]; 429 var lastUpdate = element.getElementsByClassName("subscriptionUpdate")[0];
417 lastUpdate.classList.remove("error"); 430 lastUpdate.classList.remove("error");
418 if (Synchronizer.isExecuting(subscription.url)) 431
419 lastUpdate.textContent = i18n.getMessage("filters_subscription_lastDownload_ inProgress"); 432 if (subscription.downloadStatus &&
420 else if (subscription.downloadStatus && subscription.downloadStatus != "synchr onize_ok") 433 subscription.downloadStatus != "synchronize_ok")
421 { 434 {
422 var map = 435 var map =
423 { 436 {
424 "synchronize_invalid_url": "filters_subscription_lastDownload_invalidURL", 437 "synchronize_invalid_url": "filters_subscription_lastDownload_invalidURL" ,
425 "synchronize_connection_error": "filters_subscription_lastDownload_connect ionError", 438 "synchronize_connection_error": "filters_subscription_lastDownload_connec tionError",
426 "synchronize_invalid_data": "filters_subscription_lastDownload_invalidData ", 439 "synchronize_invalid_data": "filters_subscription_lastDownload_invalidDat a",
427 "synchronize_checksum_mismatch": "filters_subscription_lastDownload_checks umMismatch" 440 "synchronize_checksum_mismatch": "filters_subscription_lastDownload_check sumMismatch"
428 }; 441 };
429 if (subscription.downloadStatus in map) 442 if (subscription.downloadStatus in map)
430 lastUpdate.textContent = i18n.getMessage(map[subscription.downloadStatus]) ; 443 lastUpdate.textContent = i18n.getMessage(map[subscription.downloadStatus] );
431 else 444 else
432 lastUpdate.textContent = subscription.downloadStatus; 445 lastUpdate.textContent = subscription.downloadStatus;
433 lastUpdate.classList.add("error"); 446 lastUpdate.classList.add("error");
434 } 447 }
435 else if (subscription.lastDownload > 0) 448 else if (subscription.lastDownload > 0)
436 { 449 {
437 var timeDate = i18n_timeDateStrings(subscription.lastDownload * 1000); 450 var timeDate = i18n_timeDateStrings(subscription.lastDownload * 1000);
438 var messageID = (timeDate[1] ? "last_updated_at" : "last_updated_at_today"); 451 var messageID = (timeDate[1] ? "last_updated_at" : "last_updated_at_today");
439 lastUpdate.textContent = i18n.getMessage(messageID, timeDate); 452 lastUpdate.textContent = i18n.getMessage(messageID, timeDate);
440 } 453 }
441 } 454 }
442 455
443 function onSubscriptionChange(subscription) 456 function onSubscriptionMessage(action, subscription)
444 { 457 {
445 var element = findSubscriptionElement(subscription); 458 switch (action)
446 if (element)
447 updateSubscriptionInfo(element);
448 }
449
450 function onSubscriptionAdded(subscription)
451 {
452 if (subscription instanceof SpecialSubscription)
453 { 459 {
454 for (var i = 0; i < subscription.filters.length; i++) 460 case "title":
455 onFilterAdded(subscription.filters[i]); 461 case "disabled":
456 } 462 case "homepage":
457 else if (subscription.url == Prefs.subscriptions_exceptionsurl) 463 case "lastDownload":
458 $("#acceptableAds").prop("checked", true); 464 case "downloadStatus":
459 else if (!findSubscriptionElement(subscription)) 465 var element = findSubscriptionElement(subscription);
460 addSubscriptionEntry(subscription); 466 if (element)
461 } 467 updateSubscriptionInfo(element, subscription);
462 468 break;
463 function onSubscriptionRemoved(subscription) 469 case "added":
464 { 470 getPref("subscriptions_exceptionsurl", function (acceptableAdsUrl)
465 if (subscription instanceof SpecialSubscription) 471 {
466 { 472 if (subscription.url == acceptableAdsUrl)
467 for (var i = 0; i < subscription.filters.length; i++) 473 $("#acceptableAds").prop("checked", true);
468 onFilterRemoved(subscription.filters[i]); 474 else if (!findSubscriptionElement(subscription))
469 } 475 addSubscriptionEntry(subscription);
470 else if (subscription.url == Prefs.subscriptions_exceptionsurl) 476 });
471 $("#acceptableAds").prop("checked", false); 477 break;
472 else 478 case "removed":
473 { 479 getPref("subscriptions_exceptionsurl", function (acceptableAdsUrl)
474 var element = findSubscriptionElement(subscription); 480 {
475 if (element) 481 if (subscription.url == acceptableAdsUrl)
476 element.parentNode.removeChild(element); 482 {
483 $("#acceptableAds").prop("checked", false);
484 }
485 else
486 {
487 var element = findSubscriptionElement(subscription);
488 if (element)
489 element.parentNode.removeChild(element);
490 }
491 });
492 break;
477 } 493 }
478 } 494 }
479 495
480 function onFilterAdded(filter) 496 function onPrefMessage(key, value)
481 { 497 {
482 if (filter instanceof WhitelistFilter && 498 switch (key)
483 /^@@\|\|([^\/:]+)\^\$document$/.test(filter.text)) 499 {
484 appendToListBox("excludedDomainsBox", RegExp.$1); 500 case "notifications_showui":
485 else 501 document.getElementById("shouldShowNotificationsContainer").hidden = !valu e;
486 appendToListBox("userFiltersBox", filter.text); 502 return;
503 case "notifications_ignoredcategories":
504 key = "shouldShowNotifications";
505 value = value.indexOf("*") == -1;
506 break;
507 }
508
509 var checkbox = document.getElementById(key);
510 if (checkbox)
511 checkbox.checked = value;
487 } 512 }
488 513
489 function onFilterRemoved(filter) 514 function onFilterMessage(action, filter)
490 { 515 {
491 if (filter instanceof WhitelistFilter && 516 switch (action)
492 /^@@\|\|([^\/:]+)\^\$document$/.test(filter.text)) 517 {
493 removeFromListBox("excludedDomainsBox", RegExp.$1); 518 case "loaded":
494 else 519 reloadFilters();
495 removeFromListBox("userFiltersBox", filter.text); 520 break;
521 case "added":
522 if (whitelistedDomainRegexp.test(filter.text))
523 appendToListBox("excludedDomainsBox", RegExp.$1);
524 else
525 appendToListBox("userFiltersBox", filter.text);
526 break;
527 case "removed":
528 if (whitelistedDomainRegexp.test(filter.text))
529 removeFromListBox("excludedDomainsBox", RegExp.$1);
530 else
531 removeFromListBox("userFiltersBox", filter.text);
532 break;
533 }
496 } 534 }
497 535
498 // Populates a list box with a number of entries 536 function clearListBox(id)
499 function populateList(id, entries)
500 { 537 {
501 var list = document.getElementById(id); 538 var list = document.getElementById(id);
502 while (list.lastChild) 539 while (list.lastChild)
503 list.removeChild(list.lastChild); 540 list.removeChild(list.lastChild);
504
505 entries.sort();
506 for (var i = 0; i < entries.length; i++)
507 {
508 var option = new Option();
509 option.text = entries[i];
510 option.value = entries[i];
511 list.appendChild(option);
512 }
513 } 541 }
514 542
515 // Add a filter string to the list box. 543 // Add a filter string to the list box.
516 function appendToListBox(boxId, text) 544 function appendToListBox(boxId, text)
517 { 545 {
518 var elt = new Option(); /* Note: document.createElement("option") is unreliab le in Opera */ 546 // Note: document.createElement("option") is unreliable in Opera
547 var elt = new Option();
519 elt.text = text; 548 elt.text = text;
520 elt.value = text; 549 elt.value = text;
521 document.getElementById(boxId).appendChild(elt); 550 document.getElementById(boxId).appendChild(elt);
522 } 551 }
523 552
524 // Remove a filter string from a list box. 553 // Remove a filter string from a list box.
525 function removeFromListBox(boxId, text) 554 function removeFromListBox(boxId, text)
526 { 555 {
527 var list = document.getElementById(boxId); 556 var list = document.getElementById(boxId);
528 for (var i = 0; i < list.length; i++) 557 for (var i = 0; i < list.length; i++)
529 if (list.options[i].value == text) 558 if (list.options[i].value == text)
530 list.remove(i--); 559 list.remove(i--);
531 } 560 }
532 561
533 function addWhitelistDomain(event) 562 function addWhitelistDomain(event)
534 { 563 {
535 event.preventDefault(); 564 event.preventDefault();
536 565
537 var domain = document.getElementById("newWhitelistDomain").value.replace(/\s/g , ""); 566 var domain = document.getElementById("newWhitelistDomain").value.replace(/\s/g , "");
538 document.getElementById("newWhitelistDomain").value = ""; 567 document.getElementById("newWhitelistDomain").value = "";
539 if (!domain) 568 if (!domain)
540 return; 569 return;
541 570
542 var filterText = "@@||" + domain + "^$document"; 571 var filterText = "@@||" + domain + "^$document";
543 FilterStorage.addFilter(Filter.fromText(filterText)); 572 addFilter(filterText);
544 } 573 }
545 574
546 // Adds filter text that user typed to the selection box 575 // Adds filter text that user typed to the selection box
547 function addTypedFilter(event) 576 function addTypedFilter(event)
548 { 577 {
549 event.preventDefault(); 578 event.preventDefault();
550 579
551 var element = document.getElementById("newFilter"); 580 var element = document.getElementById("newFilter");
552 var result = parseFilter(element.value); 581 addFilter(element.value, function (errors)
553
554 if (result.error)
555 { 582 {
556 alert(result.error); 583 if (errors.length > 0)
557 return; 584 alert(errors.join("\n"));
558 } 585 else
559 586 element.value = "";
560 if (result.filter) 587 });
561 FilterStorage.addFilter(result.filter);
562
563 element.value = "";
564 } 588 }
565 589
566 // Removes currently selected whitelisted domains 590 // Removes currently selected whitelisted domains
567 function removeSelectedExcludedDomain(event) 591 function removeSelectedExcludedDomain(event)
568 { 592 {
569 event.preventDefault(); 593 event.preventDefault();
570 var excludedDomainsBox = document.getElementById("excludedDomainsBox"); 594 var excludedDomainsBox = document.getElementById("excludedDomainsBox");
571 var remove = []; 595 var remove = [];
572 for (var i = 0; i < excludedDomainsBox.length; i++) 596 for (var i = 0; i < excludedDomainsBox.length; i++)
573 if (excludedDomainsBox.options[i].selected) 597 if (excludedDomainsBox.options[i].selected)
574 remove.push(excludedDomainsBox.options[i].value); 598 remove.push(excludedDomainsBox.options[i].value);
575 if (!remove.length) 599 if (!remove.length)
576 return; 600 return;
577 601
578 for (var i = 0; i < remove.length; i++) 602 for (var i = 0; i < remove.length; i++)
579 FilterStorage.removeFilter(Filter.fromText("@@||" + remove[i] + "^$document" )); 603 removeFilter("@@||" + remove[i] + "^$document");
580 } 604 }
581 605
582 // Removes all currently selected filters 606 // Removes all currently selected filters
583 function removeSelectedFilters(event) 607 function removeSelectedFilters(event)
584 { 608 {
585 event.preventDefault(); 609 event.preventDefault();
586 var userFiltersBox = document.getElementById("userFiltersBox"); 610 var userFiltersBox = document.getElementById("userFiltersBox");
587 var remove = []; 611 var remove = [];
588 for (var i = 0; i < userFiltersBox.length; i++) 612 for (var i = 0; i < userFiltersBox.length; i++)
589 if (userFiltersBox.options[i].selected) 613 if (userFiltersBox.options[i].selected)
590 remove.push(userFiltersBox.options[i].value); 614 remove.push(userFiltersBox.options[i].value);
591 if (!remove.length) 615 if (!remove.length)
592 return; 616 return;
593 617
594 for (var i = 0; i < remove.length; i++) 618 for (var i = 0; i < remove.length; i++)
595 FilterStorage.removeFilter(Filter.fromText(remove[i])); 619 removeFilter(remove[i]);
596 } 620 }
597 621
598 // Shows raw filters box and fills it with the current user filters 622 // Shows raw filters box and fills it with the current user filters
599 function toggleFiltersInRawFormat(event) 623 function toggleFiltersInRawFormat(event)
600 { 624 {
601 event.preventDefault(); 625 event.preventDefault();
602 626
603 $("#rawFilters").toggle(); 627 $("#rawFilters").toggle();
604 if ($("#rawFilters").is(":visible")) 628 if ($("#rawFilters").is(":visible"))
605 { 629 {
606 var userFiltersBox = document.getElementById("userFiltersBox"); 630 var userFiltersBox = document.getElementById("userFiltersBox");
607 var text = ""; 631 var text = "";
608 for (var i = 0; i < userFiltersBox.length; i++) 632 for (var i = 0; i < userFiltersBox.length; i++)
609 text += userFiltersBox.options[i].value + "\n"; 633 text += userFiltersBox.options[i].value + "\n";
610 document.getElementById("rawFiltersText").value = text; 634 document.getElementById("rawFiltersText").value = text;
611 } 635 }
612 } 636 }
613 637
614 // Imports filters in the raw text box 638 // Imports filters in the raw text box
615 function importRawFiltersText() 639 function importRawFiltersText()
616 { 640 {
617 var text = document.getElementById("rawFiltersText").value; 641 var text = document.getElementById("rawFiltersText").value;
618 var result = parseFilters(text);
619 642
620 var errors = result.errors.filter(function(e) 643 importRawFilters(text, function (errors)
621 { 644 {
622 return e.type != "unexpected-filter-list-header"; 645 if (errors.length > 0)
646 alert(errors.join("\n"));
647 else
648 $("#rawFilters").hide();
623 }); 649 });
624
625 if (errors.length > 0)
626 {
627 alert(errors.join("\n"));
628 return;
629 }
630
631 var seenFilter = Object.create(null);
632 for (var i = 0; i < result.filters.length; i++)
633 {
634 var filter = result.filters[i];
635 FilterStorage.addFilter(filter);
636 seenFilter[filter.text] = null;
637 }
638
639 var remove = [];
640 for (var i = 0; i < FilterStorage.subscriptions.length; i++)
641 {
642 var subscription = FilterStorage.subscriptions[i];
643 if (!(subscription instanceof SpecialSubscription))
644 continue;
645
646 for (var j = 0; j < subscription.filters.length; j++)
647 {
648 var filter = subscription.filters[j];
649 if (filter instanceof WhitelistFilter && /^@@\|\|([^\/:]+)\^\$document$/.t est(filter.text))
650 continue;
651
652 if (!(filter.text in seenFilter))
653 remove.push(filter);
654 }
655 }
656
657 for (var i = 0; i < remove.length; i++)
658 FilterStorage.removeFilter(remove[i]);
659
660 $("#rawFilters").hide();
661 } 650 }
662 651
663 // Called when user explicitly requests filter list updates 652 // Called when user explicitly requests filter list updates
664 function updateFilterLists() 653 function updateFilterLists()
665 { 654 {
666 for (var i = 0; i < FilterStorage.subscriptions.length; i++) 655 // Without the URL parameter this will update all subscriptions
656 updateSubscription();
657
658 // Display a message for any subscriptions that are currently being downloaded
659 getSubscriptions(true, false, function(subscriptions)
667 { 660 {
668 var subscription = FilterStorage.subscriptions[i]; 661 var inProgressMessage = i18n.getMessage(
669 if (subscription instanceof DownloadableSubscription) 662 "filters_subscription_lastDownload_inProgress"
670 Synchronizer.execute(subscription, true, true); 663 );
671 } 664
665 for (var i = 0; i < subscriptions.length; i += 1)
666 {
667 var element = findSubscriptionElement(subscriptions[i]);
668 if (element)
669 {
670 var label = element.getElementsByClassName("subscriptionUpdate")[0];
671 isSubscriptionDownloading(subscriptions[i].url, function(isDownloading)
672 {
673 if (isDownloading)
674 label.textContent = inProgressMessage;
675 });
676 }
677 }
678 });
672 } 679 }
673 680
674 // Adds a subscription entry to the UI. 681 // Adds a subscription entry to the UI.
675 function addSubscriptionEntry(subscription) 682 function addSubscriptionEntry(subscription)
676 { 683 {
677 var template = document.getElementById("subscriptionTemplate"); 684 var template = document.getElementById("subscriptionTemplate");
678 var element = template.cloneNode(true); 685 var element = template.cloneNode(true);
679 element.removeAttribute("id"); 686 element.removeAttribute("id");
680 element._subscription = subscription; 687 element._subscription = subscription;
681 688
682 var removeButton = element.getElementsByClassName("subscriptionRemoveButton")[ 0]; 689 var removeButton = element.getElementsByClassName("subscriptionRemoveButton")[ 0];
683 removeButton.setAttribute("title", removeButton.textContent); 690 removeButton.setAttribute("title", removeButton.textContent);
684 removeButton.textContent = "\xD7"; 691 removeButton.textContent = "\xD7";
685 removeButton.addEventListener("click", function() 692 removeButton.addEventListener("click", function()
686 { 693 {
687 if (!confirm(i18n.getMessage("global_remove_subscription_warning"))) 694 if (!confirm(i18n.getMessage("global_remove_subscription_warning")))
688 return; 695 return;
689 696
690 FilterStorage.removeSubscription(subscription); 697 removeSubscription(subscription.url);
691 }, false); 698 }, false);
692 if (Prefs.additional_subscriptions.indexOf(subscription.url) != -1) 699
693 removeButton.style.visibility = "hidden"; 700 getPref("additional_subscriptions", function (additionalSubscriptions)
701 {
702 if (additionalSubscriptions.indexOf(subscription.url) != -1)
703 removeButton.style.visibility = "hidden";
704 });
694 705
695 var enabled = element.getElementsByClassName("subscriptionEnabled")[0]; 706 var enabled = element.getElementsByClassName("subscriptionEnabled")[0];
696 enabled.addEventListener("click", function() 707 enabled.addEventListener("click", function()
697 { 708 {
698 if (subscription.disabled == !enabled.checked) 709 subscription.disabled = !subscription.disabled;
699 return; 710 toggleSubscription(subscription.url, true);
700
701 subscription.disabled = !enabled.checked;
702 }, false); 711 }, false);
703 712
704 updateSubscriptionInfo(element); 713 updateSubscriptionInfo(element);
705 714
706 document.getElementById("filterLists").appendChild(element); 715 document.getElementById("filterLists").appendChild(element);
707 } 716 }
708 717
709 function setLinks(id) 718 function setLinks(id)
710 { 719 {
711 var element = document.getElementById(id); 720 var element = document.getElementById(id);
712 if (!element) 721 if (!element)
713 return; 722 return;
714 723
715 var links = element.getElementsByTagName("a"); 724 var links = element.getElementsByTagName("a");
716 for (var i = 0; i < links.length; i++) 725 for (var i = 0; i < links.length; i++)
717 { 726 {
718 if (typeof arguments[i + 1] == "string") 727 if (typeof arguments[i + 1] == "string")
719 { 728 {
720 links[i].href = arguments[i + 1]; 729 links[i].href = arguments[i + 1];
721 links[i].setAttribute("target", "_blank"); 730 links[i].setAttribute("target", "_blank");
722 } 731 }
723 else if (typeof arguments[i + 1] == "function") 732 else if (typeof arguments[i + 1] == "function")
724 { 733 {
725 links[i].href = "javascript:void(0);"; 734 links[i].href = "javascript:void(0);";
726 links[i].addEventListener("click", arguments[i + 1], false); 735 links[i].addEventListener("click", arguments[i + 1], false);
727 } 736 }
728 } 737 }
729 } 738 }
739
740 ext.onMessage.addListener(function(message)
741 {
742 switch (message.type)
743 {
744 case "app.respond":
745 switch (message.action)
746 {
747 case "addSubscription":
748 var subscription = message.args[0];
749 startSubscriptionSelection(subscription.title, subscription.url);
750 break;
751 case "switchToOptionsSection":
752 var tabs = document.getElementsByClassName("ui-tabs-panel");
753 for (var i = 0; i < tabs.length; i++)
754 {
755 var found = tabs[i].querySelector(
756 "[data-section='" + message.section + "']"
757 );
758 if (!found)
759 continue;
760
761 var previous = document.getElementsByClassName("focused");
762 if (previous.length > 0)
763 previous[0].classList.remove("focused");
764
765 var tab = $("[href='#" + tabs[i].id + "']");
766 $("#tabs").tabs("select", tab.parent().index());
767 found.classList.add("focused");
768 }
769 break;
770 }
771 break;
772 case "filters.respond":
773 onFilterMessage(message.action, message.args[0]);
774 break;
775 case "prefs.respond":
776 onPrefMessage(message.action, message.args[0]);
777 break;
778 case "subscriptions.respond":
779 onSubscriptionMessage(message.action, message.args[0]);
780 break;
781 }
782 });
OLDNEW
« no previous file with comments | « lib/notificationHelper.js ('k') | safari/ext/background.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld