projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3ac6eb5
)
Roo/bootstrap/Navbar.js
author
Alan Knowles
<alan@roojs.com>
Tue, 15 Jan 2019 03:11:02 +0000
(11:11 +0800)
committer
Alan Knowles
<alan@roojs.com>
Tue, 15 Jan 2019 03:11:02 +0000
(11:11 +0800)
Roo/bootstrap/Navbar.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/Navbar.js
b/Roo/bootstrap/Navbar.js
index
6be0be3
..
94577ee
100644
(file)
--- a/
Roo/bootstrap/Navbar.js
+++ b/
Roo/bootstrap/Navbar.js
@@
-108,7
+108,12
@@
Roo.extend(Roo.bootstrap.Navbar, Roo.bootstrap.Component, {
*/
expand : function ()
{
+
var ce = this.el.select('.navbar-collapse',true).first();
+ if (ce.hasClass('collapsing')) {
+ return;
+ }
+
// show it...
ce.addClass('in'); // old...
ce.removeClass('collapse');
@@
-135,6
+140,10
@@
Roo.extend(Roo.bootstrap.Navbar, Roo.bootstrap.Component, {
*/
collapse : function()
{
+
+ if (ce.hasClass('collapsing')) {
+ return;
+ }
var ce = this.el.select('.navbar-collapse',true).first();
ce.removeClass('in'); // old...
ce.setHeight(ce.getHeight());