From ef9fcb775522afa5aafe08ce78b047820d938299 Mon Sep 17 00:00:00 2001
From: piro <piro@599a83e7-65a4-db11-8015-0010dcdd6dc2>
Date: Tue, 25 Aug 2009 10:05:47 +0000
Subject: [PATCH] =?UTF-8?q?Firefox=203.5=E3=81=A7=E6=9C=9F=E5=BE=85?=
 =?UTF-8?q?=E9=80=9A=E3=82=8A=E3=81=AB=E5=8B=95=E3=81=84=E3=81=A6=E3=81=84?=
 =?UTF-8?q?=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F?=
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@4999 599a83e7-65a4-db11-8015-0010dcdd6dc2
---
 content/treestyletab/config.xul             | 2 +-
 content/treestyletab/treestyletab.js        | 7 +++----
 content/treestyletab/treestyletabbrowser.js | 1 +
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/content/treestyletab/config.xul b/content/treestyletab/config.xul
index 491245b3..4106643b 100644
--- a/content/treestyletab/config.xul
+++ b/content/treestyletab/config.xul
@@ -95,7 +95,7 @@
 					</row>
 					<row>
 						<radio value="left" label="&config.tabbar.position.left;"/>
-						<box style="border: ThreeDShadow 1px solid; margin: 0.3em; background: white; margin: 0;"/>
+						<box style="border: ThreeDShadow 1px solid; background: white; margin: 0;"/>
 						<radio value="right" label="&config.tabbar.position.right;"/>
 					</row>
 					<row align="start">
diff --git a/content/treestyletab/treestyletab.js b/content/treestyletab/treestyletab.js
index 17821c88..6f4c06c5 100644
--- a/content/treestyletab/treestyletab.js
+++ b/content/treestyletab/treestyletab.js
@@ -1891,7 +1891,7 @@ catch(e) {
 			)
 		);
 
-		if (!('getSupportedFlavours' in contentAreaDNDObserver)) { // Firefox 3.1 or later
+		if (!('getSupportedFlavours' in contentAreaDNDObserver)) { // Firefox 3.6 or later
 			eval('contentAreaDNDObserver.onDrop = '+
 				contentAreaDNDObserver.onDrop.toSource().replace(
 					'var types = aEvent.dataTransfer.types;',
@@ -1908,10 +1908,9 @@ catch(e) {
 				contentAreaDNDObserver.onDrop.toSource().replace(
 					'{',
 					<![CDATA[$&
-						if (aXferData.flavour.contentType == gBrowser.treeStyleTab.kDRAG_TYPE_TABBAR) {
+						if (gBrowser.treeStyleTab.panelDNDObserver.canDrop(aEvent, aDragSession)) {
 							aEvent.preventDefault();
-							aEvent.stopPropagation();
-							return gBrowser.treeStyleTab.panelDNDObserver.onDrop(aEvent);
+							return gBrowser.treeStyleTab.panelDNDObserver.onDrop(aEvent, aXferData, aDragSession);
 						}
 					]]>
 				)
diff --git a/content/treestyletab/treestyletabbrowser.js b/content/treestyletab/treestyletabbrowser.js
index 39a78134..5a88fe6a 100644
--- a/content/treestyletab/treestyletabbrowser.js
+++ b/content/treestyletab/treestyletabbrowser.js
@@ -2503,6 +2503,7 @@ TreeStyleTabBrowser.prototype = {
 	canDrop : function(aEvent, aDragSession) 
 	{
 		return (
+				aDragSession &&
 				aDragSession.isDataFlavorSupported(this.mOwner.kDRAG_TYPE_TABBAR) &&
 				aDragSession.sourceNode
 			) ? true : false ;