projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
04a5c4e
)
Roo/bootstrap/Menu.js
author
Edward
<edward@roojs.com>
Fri, 27 Mar 2015 04:48:47 +0000
(12:48 +0800)
committer
Edward
<edward@roojs.com>
Fri, 27 Mar 2015 04:48:47 +0000
(12:48 +0800)
Roo/bootstrap/Menu.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/Menu.js
b/Roo/bootstrap/Menu.js
index
edaf026
..
a482771
100644
(file)
--- a/
Roo/bootstrap/Menu.js
+++ b/
Roo/bootstrap/Menu.js
@@
-297,10
+297,10
@@
Roo.extend(Roo.bootstrap.Menu, Roo.bootstrap.Component, {
Roo.log('trigger press');
//Roo.log(e.getTarget());
// Roo.log(this.triggerEl.dom);
- if (Roo.get(e.getTarget()).findParent('.dropdown-menu')
|| Roo.get(e.getTarget()).findParent('.user-menu')
) {
+ if (Roo.get(e.getTarget()).findParent('.dropdown-menu')) {
return;
}
- Roo.log(Roo.get(e.getTarget()).findParent('.user-menu'));
+
if (this.isVisible()) {
Roo.log('hide');
this.hide();