[Pkg-mozext-commits] [greasemonkey] 54/62: Merge remote-tracking branch 'GM_openInTab_closable_reopenable' - conflicts, merged fails

[David Prévot]

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

taffit pushed a commit to branch master
in repository greasemonkey.

commit c582e9ed1fbe29788e74cbd6101a4c30b5967c06
Author: janekptacijarabaci <janekptacijarabaci at seznam.cz>
Date:   Tue Sep 1 07:54:42 2015 +0200

    Merge remote-tracking branch 'GM_openInTab_closable_reopenable' - conflicts, merged fails
---
 content/browser.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/content/browser.js b/content/browser.js
index 72ddab0..13f5385 100644
--- a/content/browser.js
+++ b/content/browser.js
@@ -88,8 +88,14 @@ GM_BrowserUI.openInTab = function(aMessage) {
         : aMessage.data.inBackground;
     if (scriptTabIsCurrentTab && !prefBg) tabBrowser.selectedTab = newTab;
 
-    var prefRel = getBool('browser.tabs.insertRelatedAfterCurrent');
-    if (prefRel) tabBrowser.moveTabTo(newTab, scriptTab._tPos + 1);
+    var prefRel = (aMessage.data.afterCurrent === null)
+        ? getBool("browser.tabs.insertRelatedAfterCurrent")
+        : aMessage.data.afterCurrent;
+    if (prefRel) {
+      tabBrowser.moveTabTo(newTab, scriptTab._tPos + 1);
+    } else {
+      tabBrowser.moveTabTo(newTab, tabBrowser.tabs.length - 1);  
+    }
   }, 0);
 };
 

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