ツールチップが表示された後にタブバーの自動開閉が行われなくなってしまうことがあったのを修正

git-svn-id: http://www.cozmixng.org/repos/piro/treestyletab/trunk@4438 599a83e7-65a4-db11-8015-0010dcdd6dc2
This commit is contained in:
piro 2009-05-14 17:47:21 +00:00
parent 6078a5cc30
commit bfda157100

View File

@ -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':