diff options
| -rw-r--r-- | js/vapi-background.js | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/js/vapi-background.js b/js/vapi-background.js index cca47c6..ae933b7 100644 --- a/js/vapi-background.js +++ b/js/vapi-background.js @@ -2362,24 +2362,16 @@ vAPI.toolbarButton = { /******************************************************************************/ -// Firefox 28 and less - (function() { + // Add toolbar button for not-Basilisk + if (Services.appinfo.ID === "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}") { + return; + } + var tbb = vAPI.toolbarButton; if ( tbb.init !== null ) { return; } - var CustomizableUI = null; - var forceLegacyToolbarButton = vAPI.localStorage.getBool('forceLegacyToolbarButton'); - if ( !forceLegacyToolbarButton ) { - try { - CustomizableUI = Cu.import('resource:///modules/CustomizableUI.jsm', null).CustomizableUI; - } catch (ex) { - } - } - if ( CustomizableUI !== null ) { - return; - } tbb.codePath = 'legacy'; tbb.viewId = tbb.id + '-panel'; @@ -2604,13 +2596,20 @@ vAPI.toolbarButton = { /******************************************************************************/ -// Firefox Australis < 36. - (function() { + // Add toolbar button for Basilisk + if (Services.appinfo.ID !== "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}") { + return; + } + var tbb = vAPI.toolbarButton; if ( tbb.init !== null ) { return; } + + // The following guard seems to always be false for Basilisk, so + // the button will always be added using the code from this + // branch. if ( Services.vc.compare(Services.appinfo.platformVersion, '36.0') >= 0 ) { return null; } |