From bfda157100e4f565f1f5f624a4b623caac400f47 Mon Sep 17 00:00:00 2001
From: piro <piro@599a83e7-65a4-db11-8015-0010dcdd6dc2>
Date: Thu, 14 May 2009 17:47:21 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=84=E3=83=BC=E3=83=AB=E3=83=81=E3=83=83?=
 =?UTF-8?q?=E3=83=97=E3=81=8C=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=81=9F?=
 =?UTF-8?q?=E5=BE=8C=E3=81=AB=E3=82=BF=E3=83=96=E3=83=90=E3=83=BC=E3=81=AE?=
 =?UTF-8?q?=E8=87=AA=E5=8B=95=E9=96=8B=E9=96=89=E3=81=8C=E8=A1=8C=E3=82=8F?=
 =?UTF-8?q?=E3=82=8C=E3=81=AA=E3=81=8F=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=97?=
 =?UTF-8?q?=E3=81=BE=E3=81=86=E3=81=93=E3=81=A8=E3=81=8C=E3=81=82=E3=81=A3?=
 =?UTF-8?q?=E3=81=9F=E3=81=AE=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@4438 599a83e7-65a4-db11-8015-0010dcdd6dc2
---
 content/treestyletab/treestyletab.js | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/content/treestyletab/treestyletab.js b/content/treestyletab/treestyletab.js
index ff06443a..6d1fb5f7 100644
--- a/content/treestyletab/treestyletab.js
+++ b/content/treestyletab/treestyletab.js
@@ -1747,23 +1747,29 @@ catch(e) {
 					aEvent.target == aEvent.currentTarget) {
 					this.initContextMenu();
 				}
-				if (!this.evaluateXPath(
-						'not(self::*[local-name()="tooltip" or local-name()="panel"]) and '+
+				if (!this.popupMenuShown &&
+					!this.evaluateXPath(
+						'local-name() = "tooltip" or local-name() ="panel" or '+
 						'parent::*/ancestor-or-self::*[local-name()="popup" or local-name()="menupopup"]',
 						aEvent.originalTarget,
 						XPathResult.BOOLEAN_TYPE
-					).booleanValue)
+					).booleanValue) {
+					Application.console.log('show '+aEvent.originalTarget.localName+'#'+aEvent.originalTarget.id);
 					this.popupMenuShown = true;
+				}
 				return;
 
 			case 'popuphiding':
-				if (!this.evaluateXPath(
-						'not(self::*[local-name()="tooltip" or local-name()="panel"]) and '+
+				if (this.popupMenuShown &&
+					!this.evaluateXPath(
+						'local-name() = "tooltip" or local-name() ="panel" or '+
 						'parent::*/ancestor-or-self::*[local-name()="popup" or local-name()="menupopup"]',
 						aEvent.originalTarget,
 						XPathResult.BOOLEAN_TYPE
-					).booleanValue)
+					).booleanValue) {
+					Application.console.log('hide '+aEvent.originalTarget.id);
 					this.popupMenuShown = false;
+				}
 				return;
 
 			case 'keydown':