From 2560693e97b4898e0ab17bb6dcadc6140c30bfc1 Mon Sep 17 00:00:00 2001
From: piro <piro@599a83e7-65a4-db11-8015-0010dcdd6dc2>
Date: Wed, 21 Jul 2010 14:36:59 +0000
Subject: [PATCH] =?UTF-8?q?Minefield=E3=81=A7=E3=82=BF=E3=83=96=E3=81=AE?=
 =?UTF-8?q?=E9=80=8F=E6=98=8E=E5=BA=A6=E3=81=8C1=E3=81=A7=E5=9B=BA?=
 =?UTF-8?q?=E5=AE=9A=E3=81=95=E3=82=8C=E3=81=A6=E3=81=97=E3=81=BE=E3=81=86?=
 =?UTF-8?q?=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@7029 599a83e7-65a4-db11-8015-0010dcdd6dc2
---
 content/treestyletab/treestyletabbrowser.js | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/content/treestyletab/treestyletabbrowser.js b/content/treestyletab/treestyletabbrowser.js
index a65e69a6..50318f23 100644
--- a/content/treestyletab/treestyletabbrowser.js
+++ b/content/treestyletab/treestyletabbrowser.js
@@ -2009,9 +2009,9 @@ TreeStyleTabBrowser.prototype = {
 			this.multipleCount++;
 		}
 
-		if (this.animationEnabled) {
+		if (this.animationEnabled && !this.restoringTree) {
 			this.updateTabCollapsed(tab, true, true);
-			this.updateTabCollapsed(tab, false, this.restoringTree);
+			this.updateTabCollapsed(tab, false);
 		}
 
 		if (this.readiedToOpenDivertedTab) {
@@ -4346,14 +4346,12 @@ TreeStyleTabBrowser.prototype = {
 			if (aTime >= aDuration || stopAnimation) {
 				delete aTab.__treestyletab__updateTabCollapsedTask;
 				if (aCollapsed) aTab.setAttribute(self.kCOLLAPSED_DONE, true);
-				if (!CSSTransitionEnabled) {
-					aTab.setAttribute(
-						'style',
-						aTab.getAttribute('style')
-							.replace(self.collapseRulesRegExp, '')
-							.replace(self.kOPACITY_RULE_REGEXP, '')
-					);
-				}
+				aTab.setAttribute(
+					'style',
+					aTab.getAttribute('style')
+						.replace(self.collapseRulesRegExp, '')
+						.replace(self.kOPACITY_RULE_REGEXP, '')
+				);
 				aTab.removeAttribute(offsetAttr);
 
 				maxMargin = null;