aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlessio Vanni <vannilla@firemail.cc>2019-02-19 23:27:54 +0100
committerAlessio Vanni <vannilla@firemail.cc>2019-02-19 23:27:54 +0100
commit8e085cb3172e0c53fc3c7a5fb4fd8fb0c33e6fbb (patch)
tree328448e665df70136c3d8053487c2d4888111fc3
parent768c3853f3743cfcf4d58c97a4ce061df9ebaafe (diff)
downloadematrix-8e085cb3172e0c53fc3c7a5fb4fd8fb0c33e6fbb.tar.lz
ematrix-8e085cb3172e0c53fc3c7a5fb4fd8fb0c33e6fbb.tar.xz
ematrix-8e085cb3172e0c53fc3c7a5fb4fd8fb0c33e6fbb.zip
Remove add-on options
They were fairly useless since they were just buttons for the logger and the dashboard, that can be reached in other ways, and also something broke them somehow, making the buttons have no labels.
-rw-r--r--Makefile3
-rw-r--r--install.rdf1
-rw-r--r--js/vapi-background.js2
-rw-r--r--options.xul29
4 files changed, 2 insertions, 33 deletions
diff --git a/Makefile b/Makefile
index b848d85..6dc0934 100644
--- a/Makefile
+++ b/Makefile
@@ -25,8 +25,7 @@
# 2) It gives some flexibility in that files can be created or deleted
# freely as long as they are not part of any of these lists
-ROOTMETA := bootstrap.js install.rdf options.xul chrome.manifest \
- icon.png LICENSE.txt
+ROOTMETA := bootstrap.js install.rdf chrome.manifest icon.png LICENSE.txt
ROOTHTML := about.html asset-viewer.html background.html cloud-ui.html \
dashboard.html hosts-files.html logger-ui.html \
diff --git a/install.rdf b/install.rdf
index 2596915..d37565f 100644
--- a/install.rdf
+++ b/install.rdf
@@ -33,7 +33,6 @@
<developer>Alex Vallat</developer>
<type>2</type>
<bootstrap>true</bootstrap>
- <optionsType>2</optionsType>
<localized><r:Description>
<locale>ar</locale>
diff --git a/js/vapi-background.js b/js/vapi-background.js
index eb401bc..363733c 100644
--- a/js/vapi-background.js
+++ b/js/vapi-background.js
@@ -3186,7 +3186,7 @@ var optionsObserver = (function() {
};
})();
-optionsObserver.register();
+// optionsObserver.register();
/******************************************************************************/
/******************************************************************************/
diff --git a/options.xul b/options.xul
deleted file mode 100644
index 52dd39a..0000000
--- a/options.xul
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- ***************************************************************************
-
- ηMatrix - a browser extension to black/white list requests.
- Copyright (C) 2019 Alessio Vanni
-
- 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/}.
-
- uMatrix Home: https://github.com/gorhill/uMatrix
- -->
-<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
- <setting type="control">
- <vbox>
- <button id="showDashboardButton"/>
- <button id="showLoggerButton"/>
- </vbox>
- </setting>
-</vbox>