From 701320460b63ba746ae76e5ec630e8deca2525e7 Mon Sep 17 00:00:00 2001
From: piro <piro@599a83e7-65a4-db11-8015-0010dcdd6dc2>
Date: Tue, 13 Nov 2007 04:21:15 +0000
Subject: [PATCH] =?UTF-8?q?Tab=20Mix=20Plus=E3=81=A7=E3=80=8C=E3=83=9B?=
 =?UTF-8?q?=E3=83=BC=E3=83=A0=E3=80=8D=E3=81=8B=E3=82=89=E8=A4=87=E6=95=B0?=
 =?UTF-8?q?=E3=81=AE=E3=82=BF=E3=83=96=E3=82=92=E9=96=8B=E3=81=84=E3=81=9F?=
 =?UTF-8?q?=E6=99=82=E3=81=AB=E3=83=84=E3=83=AA=E3=83=BC=E3=81=8C=E5=A3=8A?=
 =?UTF-8?q?=E3=82=8C=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://www.cozmixng.org/repos/piro/treestyletab/trunk@1573 599a83e7-65a4-db11-8015-0010dcdd6dc2
---
 content/treestyletab/hacks.js | 45 ++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/content/treestyletab/hacks.js b/content/treestyletab/hacks.js
index 3a76ffa5..404da3a9 100644
--- a/content/treestyletab/hacks.js
+++ b/content/treestyletab/hacks.js
@@ -229,20 +229,46 @@ TreeStyleTabService.overrideExtensions = function() {
 		eval('window.TM_BrowserHome = '+
 			window.TM_BrowserHome.toSource().replace(
 				/(var bgLoad = )/,
-				'TreeStyleTabService.readyToOpenChildTab(firstTabAdded, true); $1'
+				<><![CDATA[
+					gBrowser.__treestyletab__internallyTabMoving = true;
+					TreeStyleTabService.readyToOpenChildTab(firstTabAdded, true);
+					$1
+				]]></>
 			).replace(
 				/(\})(\)?)$/,
-				'TreeStyleTabService.stopToOpenChildTab(firstTabAdded); $1$2'
+				<><![CDATA[
+					TreeStyleTabService.stopToOpenChildTab(firstTabAdded);
+					gBrowser.__treestyletab__internallyTabMoving = false;
+					$1$2
+				]]></>
+			)
+		);
+
+		eval('window.TMP_BrowserOpenTab = '+
+			window.TMP_BrowserOpenTab.toSource().replace(
+				/(var newTab = )/,
+				'gBrowser.__treestyletab__internallyTabMoving = true; $1'
+			).replace(
+				/(content.focus\(\))/,
+				'gBrowser.__treestyletab__internallyTabMoving = false; $1'
 			)
 		);
 
 		eval('window.TMP_openURL = '+
 			window.TMP_openURL.toSource().replace(
 				/(var firstTab = [^\(]+\([^\)]+\))/,
-				'$1; TreeStyleTabService.readyToOpenChildTab(firstTab, true);'
+				<><![CDATA[
+					anyBrowser.__treestyletab__internallyTabMoving = true;
+					$1;
+					TreeStyleTabService.readyToOpenChildTab(firstTab, true);
+				]]></>
 			).replace(
 				/(anyBrowser.mTabContainer.nextTab)/,
-				'TreeStyleTabService.stopToOpenChildTab(firstTab); $1'
+				<><![CDATA[
+					TreeStyleTabService.stopToOpenChildTab(firstTab);
+					anyBrowser.__treestyletab__internallyTabMoving = false;
+					$1
+				]]></>
 			)
 		);
 
@@ -300,17 +326,8 @@ TreeStyleTabService.overrideExtensions = function() {
 				)
 			);
 
-			eval('window.TMP_BrowserOpenTab = '+
-				window.TMP_BrowserOpenTab.toSource().replace(
-					/(var newTab = )/,
-					'gBrowser.__treestyletab__internallyTabMoving = true; $1'
-				).replace(
-					/(content.focus\(\))/,
-					'gBrowser.__treestyletab__internallyTabMoving = false; $1'
-				)
-			);
+			window.BrowserHome = window.TM_BrowserHome;
 			window.BrowserOpenTab = window.TMP_BrowserOpenTab;
-
 		}, 0);
 	}