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

Delta Between Two Patch Sets: options.js

Issue 29536764: Issue 5587, 5748 - Use mobile options page on Firefox for Android (Closed) Base URL: https://hg.adblockplus.org/adblockpluschrome/
Left Patch Set: Forward query string and fragment identifier to iframe Created Sept. 13, 2017, 12:24 a.m.
Right Patch Set: Remove workaround for FOUC issue and update adblockplusui dependency Created Oct. 5, 2017, 1:24 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « options.html ('k') | popup.js » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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 const {require} = chrome.extension.getBackgroundPage(); 20 let iframe = document.getElementById("content");
21 21
22 document.addEventListener("DOMContentLoaded", () => 22 iframe.onload = () =>
Manish Jethani 2017/09/13 16:07:43 No need for DOMContentLoaded now.
23 {
24 document.title = iframe.contentDocument.title;
25 };
26
27 chrome.runtime.sendMessage({
Oleksandr 2017/10/09 11:49:59 Edge does not support the 'chrome' namespace for e
Manish Jethani 2017/10/09 12:00:55 Thanks.
Sebastian Noack 2017/10/09 15:09:55 Note that we already do so in ext/common.js: https
28 type: "app.get",
29 what: "application"
30 },
31 application =>
23 { 32 {
24 // Load the mobile version of the options page on Firefox for Android. 33 // Load the mobile version of the options page on Firefox for Android.
25 let iframe = document.getElementById("content"); 34 iframe.src = iframe.getAttribute("data-src-" + application) ||
26 let src = iframe.getAttribute("data-src-" + require("info").application) || 35 iframe.getAttribute("data-src");
27 iframe.getAttribute("data-src");
28 src += location.search + location.hash;
Manish Jethani 2017/09/13 16:07:43 I find myself agreeing with Sebastian now that thi
29 iframe.src = src;
Thomas Greiner 2017/09/13 14:56:29 What difference does it make whether we do the nav
Manish Jethani 2017/09/13 16:07:43 There are two issues with redirection at the top l
Sebastian Noack 2017/09/13 16:43:24 It seems that all (external) links in the options
Thomas Greiner 2017/09/13 16:46:44 Do you mean on Android or in general?
Manish Jethani 2017/09/14 04:13:51 The redirection is visible on both desktop and mob
30 }); 36 });
LEFTRIGHT

Powered by Google App Engine
This is Rietveld