Make use of tab.lastAccessed to determine group-selected

ithinc · ithinc · commit 0e3bd5de74b9 · 2014-03-12T16:47:56.000+08:00
diff --git a/chrome/content/tabutils-st.js b/chrome/content/tabutils-st.js
@@ -228,14 +228,8 @@ tabutils._stackTabs = function() {
     if (tabs.length == 0)
       return;
 
-    if (typeof aTab == "string" || !aTab.selected && !aTab.hasAttribute("group-selected")) {
+    if (typeof aTab == "string") {
       aTab = tabs[0];
-      for (let tab of tabs) {
-        if (tab.hasAttribute("group-selected")) {
-          aTab = tab;
-          break;
-        }
-      }
     }
 
     let group = options.id ? Services.nsIUUIDGenerator.generateUUID().toString()
@@ -251,21 +245,23 @@ tabutils._stackTabs = function() {
       tab.removeAttribute("group-first");
       tab.removeAttribute("group-last");
       tab.collapsed = collapsed;
+
+      if (tab._lastAccessed > aTab._lastAccessed)
+        aTab = tab;
     }
     tabutils._tabPrefObserver.updateStackColor(group, color);
 
-    if (!aTab.selected && tabs.indexOf(this.mCurrentTab) > -1)
-      aTab = this.mCurrentTab;
-
     aTab.collapsed = false;
     tabutils.setAttribute(aTab, "group-selected", true);
     aTab.setAttribute("group-counter", tabs.length);
     tabs[0].setAttribute("group-first", true);
     tabs[tabs.length - 1].setAttribute("group-last", true);
 
-    let tabcontent = document.getAnonymousElementByAttribute(aTab, "class", "tab-content");
-    if (tabcontent)
-      tabcontent.setAttribute("group-counter", "(" + tabs.length + ")");
+    if (collapsed) {
+      let tabcontent = document.getAnonymousElementByAttribute(aTab, "class", "tab-content");
+      if (tabcontent)
+        tabcontent.setAttribute("group-counter", "(" + tabs.length + ")");
+    }
   };
 
   tabutils.addEventListener(gBrowser.mTabContainer, "dragover", function(event) {
@@ -492,19 +488,6 @@ tabutils._stackTabs = function() {
     this.detachTab(aTab);
   });
 
-  TU_hookCode("gBrowser.showOnlyTheseTabs", "{", function() { // Ensure selected tab keeps when switching group
-    Array.reduceRight(this.mTabs, function(self, aTab) {
-      if (aTabs.indexOf(aTab) == -1)
-        this.hideTab(aTab);
-    }.bind(this), this);
-    Array.reduce(this.mTabs, function(self, aTab) {
-      if (aTabs.indexOf(aTab) > -1)
-        this.showTab(aTab);
-    }.bind(this), this);
-    this.tabContainer.mTabstrip.ensureElementIsVisible(this.selectedTab, false);
-    return;
-  });
-
   TU_hookCode("gBrowser.onTabHide", "}", function() {
     if (aTab.hasAttribute("group")) {
       this.updateStack(aTab.getAttribute("group"));
diff --git a/chrome/content/tabutils.js b/chrome/content/tabutils.js
@@ -931,8 +931,8 @@ tabutils._tabClosingOptions = function() {
 
   TU_hookCode("gBrowser.onTabClose", "}", function() {
     if (gBrowser._previewMode) {
-      gBrowser._previewMode = false;
       gBrowser.selectedTab = gBrowser.mTabContainer._tabHistory[0];
+      gBrowser._previewMode = false;
     }
   });
 

Original file line number	Diff line number	Diff line change
`@@ -931,8 +931,8 @@ tabutils._tabClosingOptions = function() {`
`931`	`931`
`932`	`932`	`TU_hookCode("gBrowser.onTabClose", "}", function() {`
`933`	`933`	`if (gBrowser._previewMode) {`
`934`		`- gBrowser._previewMode = false;`
`935`	`934`	`gBrowser.selectedTab = gBrowser.mTabContainer._tabHistory[0];`
	`935`	`+ gBrowser._previewMode = false;`
`936`	`936`	`}`
`937`	`937`	`});`
`938`	`938`