From 6dd6dc5f1db047b970882b3b88cef81553473ed3 Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Tue, 18 Sep 2018 20:14:09 -0400 Subject: [PATCH] fix https://www.reddit.com/r/uBlockOrigin/comments/9gwrna/when_you_right_click_and_go_to_options_it_keeps/ --- platform/chromium/manifest.json | 4 +-- platform/chromium/options_ui.html | 13 --------- platform/chromium/options_ui.js | 47 ------------------------------- tools/make-firefox.sh | 2 -- 4 files changed, 2 insertions(+), 64 deletions(-) delete mode 100644 platform/chromium/options_ui.html delete mode 100644 platform/chromium/options_ui.js diff --git a/platform/chromium/manifest.json b/platform/chromium/manifest.json index c515dae78287c..81b87a3dcac1b 100644 --- a/platform/chromium/manifest.json +++ b/platform/chromium/manifest.json @@ -63,9 +63,9 @@ "optional_permissions": [ "file:///*" ], - "options_page": "dashboard.html", "options_ui": { - "page": "options_ui.html" + "page": "dashboard.html", + "open_in_tab": true }, "permissions": [ "contextMenus", diff --git a/platform/chromium/options_ui.html b/platform/chromium/options_ui.html deleted file mode 100644 index 9b1d0e6d77bfa..0000000000000 --- a/platform/chromium/options_ui.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - -Dashboard - - diff --git a/platform/chromium/options_ui.js b/platform/chromium/options_ui.js deleted file mode 100644 index 1e7f552b12bd9..0000000000000 --- a/platform/chromium/options_ui.js +++ /dev/null @@ -1,47 +0,0 @@ -/******************************************************************************* - - µBlock - a browser extension to block requests. - Copyright (C) 2015 The µBlock authors - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see {http://www.gnu.org/licenses/}. - - Home: https://github.com/gorhill/uBlock -*/ - -/******************************************************************************/ - -(function() { - -/******************************************************************************/ - -'use strict'; - -vAPI.messaging.send( - 'default', - { - what: 'gotoURL', - details: { - url: 'dashboard.html', - select: true, - index: -1 - } - } -); -window.close(); - -/******************************************************************************/ - -})(); - -/******************************************************************************/ diff --git a/tools/make-firefox.sh b/tools/make-firefox.sh index 6afcc7946c450..8606be8f5e08e 100755 --- a/tools/make-firefox.sh +++ b/tools/make-firefox.sh @@ -40,8 +40,6 @@ rm $DES/js/vapi-usercss.pseudo.js # Firefox/webext-specific rm $DES/img/icon_128.png -rm $DES/options_ui.html -rm $DES/js/options_ui.js echo "*** uBlock0.firefox: Generating web accessible resources..." cp -R src/web_accessible_resources $DES/