ツールチップが表示された後にタブバーの自動開閉が行われなくなってしまうことがあったのを修正
git-svn-id: http://www.cozmixng.org/repos/piro/treestyletab/trunk@4438 599a83e7-65a4-db11-8015-0010dcdd6dc2
This commit is contained in:
parent
6078a5cc30
commit
bfda157100
@ -1747,23 +1747,29 @@ catch(e) {
|
|||||||
aEvent.target == aEvent.currentTarget) {
|
aEvent.target == aEvent.currentTarget) {
|
||||||
this.initContextMenu();
|
this.initContextMenu();
|
||||||
}
|
}
|
||||||
if (!this.evaluateXPath(
|
if (!this.popupMenuShown &&
|
||||||
'not(self::*[local-name()="tooltip" or local-name()="panel"]) and '+
|
!this.evaluateXPath(
|
||||||
|
'local-name() = "tooltip" or local-name() ="panel" or '+
|
||||||
'parent::*/ancestor-or-self::*[local-name()="popup" or local-name()="menupopup"]',
|
'parent::*/ancestor-or-self::*[local-name()="popup" or local-name()="menupopup"]',
|
||||||
aEvent.originalTarget,
|
aEvent.originalTarget,
|
||||||
XPathResult.BOOLEAN_TYPE
|
XPathResult.BOOLEAN_TYPE
|
||||||
).booleanValue)
|
).booleanValue) {
|
||||||
|
Application.console.log('show '+aEvent.originalTarget.localName+'#'+aEvent.originalTarget.id);
|
||||||
this.popupMenuShown = true;
|
this.popupMenuShown = true;
|
||||||
|
}
|
||||||
return;
|
return;
|
||||||
|
|
||||||
case 'popuphiding':
|
case 'popuphiding':
|
||||||
if (!this.evaluateXPath(
|
if (this.popupMenuShown &&
|
||||||
'not(self::*[local-name()="tooltip" or local-name()="panel"]) and '+
|
!this.evaluateXPath(
|
||||||
|
'local-name() = "tooltip" or local-name() ="panel" or '+
|
||||||
'parent::*/ancestor-or-self::*[local-name()="popup" or local-name()="menupopup"]',
|
'parent::*/ancestor-or-self::*[local-name()="popup" or local-name()="menupopup"]',
|
||||||
aEvent.originalTarget,
|
aEvent.originalTarget,
|
||||||
XPathResult.BOOLEAN_TYPE
|
XPathResult.BOOLEAN_TYPE
|
||||||
).booleanValue)
|
).booleanValue) {
|
||||||
|
Application.console.log('hide '+aEvent.originalTarget.id);
|
||||||
this.popupMenuShown = false;
|
this.popupMenuShown = false;
|
||||||
|
}
|
||||||
return;
|
return;
|
||||||
|
|
||||||
case 'keydown':
|
case 'keydown':
|
||||||
|
Loading…
x
Reference in New Issue
Block a user