aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlessio Vanni <vannilla@firemail.cc>2019-07-04 17:57:11 +0200
committerAlessio Vanni <vannilla@firemail.cc>2019-07-04 17:57:11 +0200
commitdda2d514f986d068e12fd866c0a9ca9f5e3f4864 (patch)
tree0b3d47fef1ea603caabd97231ed3cb04611d97ee
parent8518e00ce1013978bebde2c8ddf36766c982ab87 (diff)
downloadematrix-dda2d514f986d068e12fd866c0a9ca9f5e3f4864.tar.lz
ematrix-dda2d514f986d068e12fd866c0a9ca9f5e3f4864.tar.xz
ematrix-dda2d514f986d068e12fd866c0a9ca9f5e3f4864.zip
Remove unused files
vapi-popup wasn't even included in background.html. Also, it seems vapi-contextmenu is useless, because vapi-tabs attempts to register it without creating it first (making registration a failure, naturally.) Since it never worked since eMatrix 1.0.0 and it doesn't seem to add anything useful, let's remove it from the XPI.
-rw-r--r--Makefile6
-rw-r--r--background.html1
-rw-r--r--js/vapi-tabs.js3
3 files changed, 2 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 18b41b5..0bdf008 100644
--- a/Makefile
+++ b/Makefile
@@ -120,13 +120,11 @@ JS3 := js/tab.js js/traffic.js js/udom.js js/uritools.js js/user-rules.js \
js/usersettings.js js/utils.js js/xal.js CallbackWrapper.jsm \
HttpRequestHeaders.jsm
-# vapi-popup.js is apparently not needed on UXP
-# TODO: investigate wether or not it can be removed
JS4 := js/vapi-client.js js/vapi-common.js js/vapi-background.js \
- js/vapi-popup.js js/vapi-tabs.js js/vapi-window.js \
+ js/vapi-tabs.js js/vapi-window.js \
js/vapi-core.js js/vapi-browser.js js/vapi-storage.js \
js/vapi-messaging.js js/vapi-net.js js/vapi-cookies.js \
- js/vapi-contextmenu.js js/vapi-cloud.js
+ js/vapi-cloud.js
JS := $(JS1) $(JS2) $(JS3) $(JS4)
diff --git a/background.html b/background.html
index a9a6e66..945aea0 100644
--- a/background.html
+++ b/background.html
@@ -41,7 +41,6 @@
<script src="js/vapi-storage.js"></script>
<script src="js/vapi-net.js"></script>
<script src="js/vapi-cookies.js"></script>
-<script src="js/vapi-contextmenu.js"></script>
<script src="js/vapi-cloud.js"></script>
<script src="js/background.js"></script>
<script src="js/xal.js"></script>
diff --git a/js/vapi-tabs.js b/js/vapi-tabs.js
index 390f449..54b09d0 100644
--- a/js/vapi-tabs.js
+++ b/js/vapi-tabs.js
@@ -576,7 +576,6 @@
} else if (tabBrowser.tabContainer) {
// Firefox
tabContainer = tabBrowser.tabContainer;
- vAPI.contextMenu.register(document);
}
// https://github.com/gorhill/uBlock/issues/697
@@ -620,8 +619,6 @@
};
let onWindowUnload = function (win) {
- vAPI.contextMenu.unregister(win.document);
-
let tabBrowser = vAPI.browser.getTabBrowser(win);
if (tabBrowser === null) {
return;