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

Side by Side Diff: options.js

Issue 29570614: Issue 5028 - Use browser namespace (Closed) Base URL: https://hg.adblockplus.org/adblockpluschrome/
Patch Set: Created Oct. 9, 2017, 3:12 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
« ext/popup.js ('K') | « notification.js ('k') | popup.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-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 // Both Edge and Mozilla Web Extensions use the namespace
Manish Jethani 2017/10/09 15:49:41 This is a duplication of Ollie's change, will be m
Sebastian Noack 2017/10/09 16:05:37 See my comment on Ollie's review. I don't think we
Manish Jethani 2017/10/09 16:08:38 Yes, so I think I can do it as part of this change
Sebastian Noack 2017/10/09 16:14:19 s/desperate/separate/
Manish Jethani 2017/10/11 10:59:18 Done.
21 // 'browser' instead of 'chrome'. Edge has chrome namespace defined,
22 // in some cases, but only with one property: 'app'.
23 if (typeof browser == "undefined" ||
24 typeof chrome != "undefined" && typeof chrome.extension != "undefined")
25 window.browser = chrome;
26
20 let iframe = document.getElementById("content"); 27 let iframe = document.getElementById("content");
21 28
22 iframe.onload = () => 29 iframe.onload = () =>
23 { 30 {
24 document.title = iframe.contentDocument.title; 31 document.title = iframe.contentDocument.title;
25 }; 32 };
26 33
27 chrome.runtime.sendMessage({ 34 browser.runtime.sendMessage({
28 type: "app.get", 35 type: "app.get",
29 what: "application" 36 what: "application"
30 }, 37 },
31 application => 38 application =>
32 { 39 {
33 // Load the mobile version of the options page on Firefox for Android. 40 // Load the mobile version of the options page on Firefox for Android.
34 iframe.src = iframe.getAttribute("data-src-" + application) || 41 iframe.src = iframe.getAttribute("data-src-" + application) ||
35 iframe.getAttribute("data-src"); 42 iframe.getAttribute("data-src");
36 }); 43 });
OLDNEW
« ext/popup.js ('K') | « notification.js ('k') | popup.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld