From 23d5c2ef20cc51cd6443dc8f3e05736398d0663c Mon Sep 17 00:00:00 2001
From: piro <piro@599a83e7-65a4-db11-8015-0010dcdd6dc2>
Date: Tue, 7 Jul 2009 05:53:30 +0000
Subject: [PATCH] =?UTF-8?q?Tab=20Mix=20Plus=E3=81=A7=E3=82=BF=E3=83=96?=
 =?UTF-8?q?=E3=82=92=E9=96=8B=E3=81=8F=E4=BD=8D=E7=BD=AE=E3=82=92=E7=8F=BE?=
 =?UTF-8?q?=E5=9C=A8=E3=81=AE=E3=82=BF=E3=83=96=E3=81=AE=E3=81=99=E3=81=90?=
 =?UTF-8?q?=E6=AC=A1=E3=81=AE=E4=BD=8D=E7=BD=AE=E3=81=AB=E8=A8=AD=E5=AE=9A?=
 =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=84=E3=82=8B=E3=81=A8=E3=80=81=E3=83=84?=
 =?UTF-8?q?=E3=83=AA=E3=83=BC=E6=A7=8B=E9=80=A0=E3=81=8C=E5=A3=8A=E3=82=8C?=
 =?UTF-8?q?=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@4651 599a83e7-65a4-db11-8015-0010dcdd6dc2
---
 content/treestyletab/hacks.js | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/content/treestyletab/hacks.js b/content/treestyletab/hacks.js
index 514f9763..e3bc720d 100644
--- a/content/treestyletab/hacks.js
+++ b/content/treestyletab/hacks.js
@@ -444,11 +444,19 @@ TreeStyleTabService.overrideExtensionsOnInitAfter = function() {
 
 			eval('gBrowser.TMP_openTabNext = '+
 				gBrowser.TMP_openTabNext.toSource().replace(
-					'{',
-					'{ var tabs = this.treeStyleTab.getDescendantTabs(this.treeStyleTab.getRootTab(this.mCurrentTab));'
-				).replace(
-					/((this.mCurrentTab._tPos)( \+ this.mTabContainer.nextTab))/,
-					'((tabs.length ? tabs[tabs.length-1]._tPos : $2 )$3)'
+					'this.mCurrentTab._tPos + this.mTabContainer.nextTab',
+					<![CDATA[
+						(function() {
+							var tabs = this.treeStyleTab.getDescendantTabs(this.mCurrentTab);
+							var index = !tabs.length ?
+										($&) :
+									this.treeStyleTab.getPref("extensions.tabmix.openTabNextInverse") ?
+										tabs[tabs.length - 1]._tPos :
+										this.mCurrentTab._tPos ;
+							if (index < aTab._tPos) index++;
+							return index;
+						}).call(this)
+					]]>
 				)
 			);