aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlessio Vanni <vannilla@firemail.cc>2019-04-23 15:05:52 +0200
committerAlessio Vanni <vannilla@firemail.cc>2019-04-23 15:05:52 +0200
commit387fb6a0f9a96ff684cea262453a7f5b6afcfbb4 (patch)
tree06fe784bd92f93621d51f48b6c9837f46ee2284c
parente20cdb5db3b67ee2d50435d694503efd1f5c35b4 (diff)
downloadematrix-387fb6a0f9a96ff684cea262453a7f5b6afcfbb4.tar.lz
ematrix-387fb6a0f9a96ff684cea262453a7f5b6afcfbb4.tar.xz
ematrix-387fb6a0f9a96ff684cea262453a7f5b6afcfbb4.zip
Use "modern" branch unconditionally
Tests showed that it works without any noticeable problems. As such, it was deemed better to throw it in the wild and see what happens. If there are any problems, this commit can simply be reverted.
-rw-r--r--js/vapi-background.js15
1 files changed, 9 insertions, 6 deletions
diff --git a/js/vapi-background.js b/js/vapi-background.js
index 6ca7572..08a84bc 100644
--- a/js/vapi-background.js
+++ b/js/vapi-background.js
@@ -2597,6 +2597,7 @@ vAPI.toolbarButton = {
/******************************************************************************/
+/*
(function() {
// Add toolbar button for Basilisk
if (Services.appinfo.ID !== "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}") {
@@ -2669,7 +2670,7 @@ vAPI.toolbarButton = {
CustomizableUI.getWidget(tbb.id).areaType === CustomizableUI.TYPE_MENU_PANEL
);
} catch (ex) {
- /* noop */
+ // noop
}
};
@@ -2725,16 +2726,18 @@ vAPI.toolbarButton = {
cleanupTasks.push(shutdown);
};
})();
+*/
/******************************************************************************/
-// Firefox Australis >= 36.
-
(function() {
// It appears that this branch actually works on the latest
// Basilisk. Maybe we can simply use this one directly instead of
// making checks like it's done now.
+ // It was decided to use this branch unconditionally. It's still
+ // experimental though.
+
// Add toolbar button for Basilisk
if (Services.appinfo.ID !== "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}") {
return;
@@ -2744,9 +2747,9 @@ vAPI.toolbarButton = {
if ( tbb.init !== null ) {
return;
}
- if ( Services.vc.compare(Services.appinfo.version, '36.0') < 0 ) {
- return null;
- }
+ // if ( Services.vc.compare(Services.appinfo.version, '36.0') < 0 ) {
+ // return null;
+ // }
var CustomizableUI = null;
try {
CustomizableUI = Cu.import('resource:///modules/CustomizableUI.jsm', null).CustomizableUI;