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

Side by Side Diff: desktop-options.js

Issue 29573083: Issue 5028 - Use browser namespace (Closed) Base URL: https://hg.adblockplus.org/adblockplusui/
Patch Set: Remove check for window.browser Created Oct. 13, 2017, 4:59 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
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-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 /* globals checkShareResource, getDocLink, i18nFormatDateTime, openSharePopup, 18 /* globals checkShareResource, getDocLink, i18nFormatDateTime, openSharePopup,
19 setLinks, E */ 19 setLinks, E */
20 20
21 "use strict"; 21 "use strict";
22 22
23 { 23 {
24 let subscriptionsMap = Object.create(null); 24 let subscriptionsMap = Object.create(null);
25 let filtersMap = Object.create(null); 25 let filtersMap = Object.create(null);
26 let collections = Object.create(null); 26 let collections = Object.create(null);
27 let acceptableAdsUrl = null; 27 let acceptableAdsUrl = null;
28 let acceptableAdsPrivacyUrl = null; 28 let acceptableAdsPrivacyUrl = null;
29 let isCustomFiltersLoaded = false; 29 let isCustomFiltersLoaded = false;
30 let {getMessage} = chrome.i18n; 30 let {getMessage} = browser.i18n;
31 let customFilters = []; 31 let customFilters = [];
32 let filterErrors = new Map([ 32 let filterErrors = new Map([
33 ["synchronize_invalid_url", 33 ["synchronize_invalid_url",
34 "options_filterList_lastDownload_invalidURL"], 34 "options_filterList_lastDownload_invalidURL"],
35 ["synchronize_connection_error", 35 ["synchronize_connection_error",
36 "options_filterList_lastDownload_connectionError"], 36 "options_filterList_lastDownload_connectionError"],
37 ["synchronize_invalid_data", 37 ["synchronize_invalid_data",
38 "options_filterList_lastDownload_invalidData"], 38 "options_filterList_lastDownload_invalidData"],
39 ["synchronize_checksum_mismatch", 39 ["synchronize_checksum_mismatch",
40 "options_filterList_lastDownload_checksumMismatch"] 40 "options_filterList_lastDownload_checksumMismatch"]
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 return element.getAttribute("data-" + dataName); 536 return element.getAttribute("data-" + dataName);
537 } 537 }
538 538
539 element = element.parentElement; 539 element = element.parentElement;
540 } 540 }
541 return null; 541 return null;
542 } 542 }
543 543
544 function sendMessageHandleErrors(message, onSuccess) 544 function sendMessageHandleErrors(message, onSuccess)
545 { 545 {
546 ext.backgroundPage.sendMessage(message, (errors) => 546 ext.backgroundPage.sendMessage(message, (errors) =>
saroyanm 2017/10/16 19:24:20 Seems like this was replaced by chrome.runtime.sen
Manish Jethani 2017/10/16 21:35:21 Done.
547 { 547 {
548 if (errors.length > 0) 548 if (errors.length > 0)
549 alert(errors.join("\n")); 549 alert(errors.join("\n"));
550 else if (onSuccess) 550 else if (onSuccess)
551 onSuccess(); 551 onSuccess();
552 }); 552 });
553 } 553 }
554 554
555 function switchTab(id) 555 function switchTab(id)
556 { 556 {
(...skipping 823 matching lines...) Expand 10 before | Expand all | Expand 10 after
1380 }); 1380 });
1381 ext.backgroundPage.sendMessage({ 1381 ext.backgroundPage.sendMessage({
1382 type: "subscriptions.listen", 1382 type: "subscriptions.listen",
1383 filter: ["added", "disabled", "homepage", "lastDownload", "removed", 1383 filter: ["added", "disabled", "homepage", "lastDownload", "removed",
1384 "title", "downloadStatus", "downloading"] 1384 "title", "downloadStatus", "downloading"]
1385 }); 1385 });
1386 1386
1387 window.addEventListener("DOMContentLoaded", onDOMLoaded, false); 1387 window.addEventListener("DOMContentLoaded", onDOMLoaded, false);
1388 window.addEventListener("hashchange", onHashChange, false); 1388 window.addEventListener("hashchange", onHashChange, false);
1389 } 1389 }
OLDNEW
« no previous file with comments | « desktop-options.html ('k') | devtools-panel.html » ('j') | polyfill.js » ('J')

Powered by Google App Engine
This is Rietveld