[Pkg-mozext-commits] [tabmixplus] 10/15: Follow up bug 1047603 - Fix passing xul:tab in the initialization of a new e10s window

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository tabmixplus.

commit 21697acfbddc199281739b6eda059acd0ec6e78a
Author: onemen <tabmix.onemen at gmail.com>
Date:   Wed Feb 11 23:02:35 2015 +0200

    Follow up bug 1047603 - Fix passing xul:tab in the initialization of a new e10s window
---
 chrome/content/links/setup.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/chrome/content/links/setup.js b/chrome/content/links/setup.js
index c8ae1c1..8f4dbfa 100644
--- a/chrome/content/links/setup.js
+++ b/chrome/content/links/setup.js
@@ -91,7 +91,9 @@ Tabmix.beforeBrowserInitOnLoad = function() {
 
     // Bug 756313 - Don't load homepage URI before first paint
     // moved this code from gBrowserInit.onLoad to gBrowserInit._delayedStartup
-    var swapOldCode = 'gBrowser.swapBrowsersAndCloseOther(gBrowser.selectedTab, uriToLoad);';
+    var swapOldCode = this.isVersion(380) ?
+        'gBrowser.swapBrowsersAndCloseOther(gBrowser.selectedTab, tabToOpen);' :
+        'gBrowser.swapBrowsersAndCloseOther(gBrowser.selectedTab, uriToLoad);';
     var loadOnStartup, swapNewCode =
       ' if (!Tabmix.singleWindowMode) {' +
       '   window.tabmix_afterTabduplicated = true;' +

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/tabmixplus.git