[Pkg-mozext-commits] [tabmixplus] 20/34: Get new tab url form BROWSER_NEW_TAB_URL after Firefox 41, fix incompatibility with Activity Stream extension
David Prévot
taffit at moszumanska.debian.org
Mon Jun 27 13:57:57 UTC 2016
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository tabmixplus.
commit 6a6672eb76edbf29055452fa701476e1c5d88f34
Author: onemen <tabmix.onemen at gmail.com>
Date: Tue Jun 14 11:45:41 2016 +0300
Get new tab url form BROWSER_NEW_TAB_URL after Firefox 41, fix incompatibility with Activity Stream extension
---
chrome/content/links/userInterface.js | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/chrome/content/links/userInterface.js b/chrome/content/links/userInterface.js
index be292fa..9bd329c 100644
--- a/chrome/content/links/userInterface.js
+++ b/chrome/content/links/userInterface.js
@@ -58,14 +58,16 @@ function TMP_BrowserOpenTab(aTab, replaceLastTab) {
return dupTab;
}
case 4 : {// user url
- let prefName = replaceLastTab ? "extensions.tabmix.replaceLastTabWith.newtab.url" :
- TabmixSvc.newtabUrl;
- try {
- url = Services.prefs.getComplexValue(prefName, Ci.nsISupportsString).data;
- if (newTabUrl == "about:privatebrowsing" && url == TabmixSvc.aboutNewtab)
- url = "about:privatebrowsing";
- } catch (ex) {
- Tabmix.assert(ex);
+ if (replaceLastTab || !Tabmix.isVersion(410) || TabmixSvc.isCyberfox) {
+ let prefName = replaceLastTab ? "extensions.tabmix.replaceLastTabWith.newtab.url" :
+ TabmixSvc.newtabUrl;
+ try {
+ url = Services.prefs.getComplexValue(prefName, Ci.nsISupportsString).data;
+ if (newTabUrl == "about:privatebrowsing" && url == TabmixSvc.aboutNewtab)
+ url = "about:privatebrowsing";
+ } catch (ex) {
+ Tabmix.assert(ex);
+ }
}
// use this if we can't find the pref
if (!url)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/tabmixplus.git
More information about the Pkg-mozext-commits
mailing list