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

Unified Diff: popup.js

Issue 29536764: Issue 5587, 5748 - Use mobile options page on Firefox for Android (Closed) Base URL: https://hg.adblockplus.org/adblockpluschrome/
Patch Set: Wait for app.listen Created Sept. 27, 2017, 12:45 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« lib/options.js ('K') | « options.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: popup.js
===================================================================
--- a/popup.js
+++ b/popup.js
@@ -19,16 +19,17 @@
const {require} = ext.backgroundPage.getWindow();
const {Filter} = require("filterClasses");
const {FilterStorage} = require("filterStorage");
const {Prefs} = require("prefs");
const {checkWhitelisted} = require("whitelisting");
const {getDecodedHostname} = require("url");
+const {showOptions} = require("options");
let page = null;
function onLoad()
{
ext.pages.query({active: true, lastFocusedWindow: true}, pages =>
{
page = pages[0];
@@ -72,17 +73,17 @@
document.getElementById("clickhide").addEventListener(
"click", activateClickHide, false
);
document.getElementById("clickhide-cancel").addEventListener(
"click", cancelClickHide, false
);
document.getElementById("options").addEventListener("click", () =>
{
- ext.showOptions(window.close);
+ showOptions(window.close);
}, false);
// Set up collapsing of menu items
for (let collapser of document.getElementsByClassName("collapse"))
{
collapser.addEventListener("click", toggleCollapse, false);
if (!Prefs[collapser.dataset.option])
{
« lib/options.js ('K') | « options.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld