[Pkg-mozext-commits] [tabmixplus] 25/34: Update "Merge windows" swapTabs according to bug 1244496, bug 1271792 and bug 1094328. Webextension tab listeners don't detect tab moved by "Merge windows"

[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 704fed609028f331239d538e39f337457ceaf2c9
Author: onemen <tabmix.onemen at gmail.com>
Date:   Thu Jun 23 14:38:41 2016 +0300

    Update "Merge windows" swapTabs according to bug 1244496, bug 1271792 and bug 1094328. Webextension tab listeners don't detect tab moved by "Merge windows"
---
 modules/MergeWindows.jsm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/modules/MergeWindows.jsm b/modules/MergeWindows.jsm
index 540fc67..3ff6621 100644
--- a/modules/MergeWindows.jsm
+++ b/modules/MergeWindows.jsm
@@ -164,10 +164,24 @@ this.MergeWindows = {
     for (let i = 0; i < tabs.length; i++) {
       let tab = tabs[i];
       let isPopup = !tab.ownerDocument.defaultView.toolbar.visible;
-      let newTab = tabbrowser.addTab("about:blank", {dontMove: isPopup});
+      let params = {dontMove: isPopup};
+      if (TabmixSvc.version(470)) {
+        params = {eventDetail: {adoptedTab: tab}};
+        if (tab.hasAttribute("usercontextid")) {
+          params.userContextId = tab.getAttribute("usercontextid");
+        }
+      }
+      let newTab = tabbrowser.addTab("about:blank", params);
       let newBrowser = newTab.linkedBrowser;
+      if (TabmixSvc.version(330)) {
+        let newURL = tab.linkedBrowser.currentURI.spec;
+        tabbrowser.updateBrowserRemotenessByURL(newBrowser, newURL);
+      }
       newBrowser.stop();
       void newBrowser.docShell;
+      if (tab.pinned) {
+        tabbrowser.pinTab(newTab);
+      }
       if (tab.hasAttribute("_TMP_selectAfterMerge")) {
         tab.removeAttribute("_TMP_selectAfterMerge");
         tabToSelect = newTab;

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