From b02c17cfd2975583a1e4563a4666891e6ed22a94 Mon Sep 17 00:00:00 2001
From: piro <piro@599a83e7-65a4-db11-8015-0010dcdd6dc2>
Date: Sun, 16 May 2010 05:08:32 +0000
Subject: [PATCH] =?UTF-8?q?=E3=82=BF=E3=83=96=E3=83=90=E3=83=BC=E3=82=92?=
 =?UTF-8?q?=E3=82=A6=E3=82=A3=E3=83=B3=E3=83=89=E3=82=A6=E5=A4=96=E3=81=AB?=
 =?UTF-8?q?=E3=83=89=E3=83=AD=E3=83=83=E3=83=97=E3=81=99=E3=82=8B=E3=81=A8?=
 =?UTF-8?q?=E7=A9=BA=E3=81=AE=E3=82=A6=E3=82=A3=E3=83=B3=E3=83=89=E3=82=A6?=
 =?UTF-8?q?=E3=81=8C=E9=96=8B=E3=81=8B=E3=82=8C=E3=81=A6=E3=81=97=E3=81=BE?=
 =?UTF-8?q?=E3=81=86=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3=EF=BC=88?=
 =?UTF-8?q?=20http://piro.sakura.ne.jp/cgi-bin/bbs.cgi=3F2698=20=EF=BC=89?=
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@6675 599a83e7-65a4-db11-8015-0010dcdd6dc2
---
 content/treestyletab/treestyletab.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/content/treestyletab/treestyletab.js b/content/treestyletab/treestyletab.js
index b735773c..8e01fb0d 100644
--- a/content/treestyletab/treestyletab.js
+++ b/content/treestyletab/treestyletab.js
@@ -533,7 +533,7 @@ var TreeStyleTabService = {
 		if ('_onDragEnd' in aObserver) { // Firefox 3.5 - 3.6
 			eval('aObserver._onDragEnd = '+aObserver._onDragEnd.toSource().replace(
 				/([^\{\}\(\);]*this\.replaceTabWithWindow\()/,
-				'if (this.treeStyleTab.isDraggingAllTabs(draggedTab)) return; $1'
+				'if (this.treeStyleTab.isDraggingAllTabs(draggedTab) || this.treeStyleTab.tabbarDNDObserver.canDragTabbar(arguments[0])) return; $1'
 			).replace(
 				'{',
 				'{ var treeStyleTab = this.treeStyleTab;'
@@ -868,7 +868,8 @@ catch(e) {
 			return;
 
 		var draggedTab = dt.mozGetDataAt(TAB_DROP_TYPE, 0);
-		if (sv.isDraggingAllTabs(draggedTab))
+		if (sv.isDraggingAllTabs(draggedTab) ||
+			sv.tabbarDNDObserver.canDragTabbar(aEvent))
 			return;
 
 		b.replaceTabWithWindow(draggedTab);