Page-scrolling and tabs-scrolling bugs fixed

IIUJ-KrzysztofDawidowicz · Feb 20, 2014 · 5450092 · 5450092
1 parent c5c0a7f
commit 5450092
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 13 deletions.
diff --git a/TabGroupBar/[email protected] b/TabGroupBar/[email protected]
diff --git a/TabGroupBar/chrome/content/tabgroupbar.js b/TabGroupBar/chrome/content/tabgroupbar.js
@@ -83,14 +83,44 @@ objTabGroupBar.addTabContextMenuItems = function(){
 objTabGroupBar.addGlobalEventListeners = function(){
     var tabContainer = this.window.getBrowser().tabContainer;
     var reloadOnEvent = function(event) {
+		// let console = (Cu.import("resource://gre/modules/devtools/Console.jsm", {})).console;
+		// console.log("Reload group tabs");
         if(!objTabGroupBar.ignoreNextEvent)
             objTabGroupBar.reloadGroupTabs();
         objTabGroupBar.ignoreNextEvent = false;
     };
-    tabContainer.addEventListener("TabSelect", reloadOnEvent);
-    window.addEventListener("tabviewframeinitialized", reloadOnEvent);
-    window.addEventListener("SSTabRestored", reloadOnEvent);
-    window.addEventListener("tabviewhidden", reloadOnEvent);
+    var changeGroupTab = function(e) {
+		// let console = (Cu.import("resource://gre/modules/devtools/Console.jsm", {})).console;
+		// console.log("Change group tab");
+		if(!objTabGroupBar.ignoreNextEvent)
+			objTabGroupBar.switchGroupTo(e.target.selectedItem.value);
+		objTabGroupBar.ignoreNextEvent = false;
+	};
+	var loadOnRestore = function(event) {
+		objTabGroupBar.ignoreNextEvent = true;
+		objTabGroupBar.reloadGroupTabs();
+		objTabGroupBar.ignoreNextEvent = false;
+	};
+	var switchSelectedGroupTab = function(event) {
+		if(objTabGroupBar.ignoreNextEvent) return;
+		var activeGroupId = event.target._tabViewTabItem.parent.id;
+		var tabs = objTabGroupBar.tabsContainer.childNodes;
+		for(let i=0;i<tabs.length;i++)
+		{
+			if(tabs[i].value==activeGroupId)
+			{
+				objTabGroupBar.ignoreNextEvent = true; //Ignore the select event from this
+				objTabGroupBar.tabsContainer.selectedIndex = i;
+				objTabGroupBar.ignoreNextEvent = false; 
+				return;
+			}
+		}
+	};
+	tabContainer.addEventListener("TabSelect", switchSelectedGroupTab);
+	this.tabsContainer.addEventListener("select", changeGroupTab, false);
+    window.addEventListener("tabviewframeinitialized", loadOnRestore);
+    window.addEventListener("SSTabRestored", loadOnRestore);
+    document.addEventListener("tabviewhidden", reloadOnEvent);
 };
 
 objTabGroupBar.hideToolbar = function TabGroupBar__hideToolbar (event) { document.getElementById("TabGroupBar-Toolbar").setAttribute("collapsed", "true"); };
@@ -205,7 +235,7 @@ objTabGroupBar.addGroupTab = function(groupItem) {
 
 
     //tab.setAttribute("oncommand", "objTabGroupBar.switchGroupTo(event.target.value);");
-    tab.addEventListener("command", function(event) {objTabGroupBar.switchGroupTo(event.target.value);});
+    //tab.addEventListener("command", function(event) {objTabGroupBar.switchGroupTo(event.target.value);});
     //tab.setAttribute("ondblclick", "objTabGroupBar.createRenameGroupTextBox(event.target);");
     tab.addEventListener("dblclick", function(event) {objTabGroupBar.createRenameGroupTextBox(event.target);});
 

diff --git a/TabGroupBar/chrome/content/tabgroupbar.xul b/TabGroupBar/chrome/content/tabgroupbar.xul
@@ -49,14 +49,9 @@
                  hidden="false"
                  persist="hidden"
                 >
-      <tabbox id="TabGroupBar-TabBox">
+      <tabbox id="TabGroupBar-TabBox" flex="1">
         <arrowscrollbox orient="horizontal">
-          <tabs id="TabGroupBar-TabBox-Tabs">
-            <!--<button label="Load tabs" oncommand="objTabGroupBar.addGroupTabs(); "/>-->
-            <!--<tab label="First tab" oncommand="objTabGroupBar.addGroupTabs(); "/>-->
-            <!--<tab label="Second tab" oncommand=""/>-->
-            <!--<tab label="Last tab"/>-->
-          </tabs>
+          <tabs id="TabGroupBar-TabBox-Tabs" flex="1"/>
         </arrowscrollbox>
 
       </tabbox>

diff --git a/TabGroupBar/install.rdf b/TabGroupBar/install.rdf
@@ -9,7 +9,7 @@
         <em:id>[email protected]</em:id>
         <em:name>Tab Group Bar</em:name>
         <em:type>2</em:type>
-        <em:version>1.4</em:version>
+        <em:version>1.4.3</em:version>
 
         <em:targetApplication>
             <Description>