Roo/bootstrap/Navbar.js

[roojs1] / Roo / bootstrap / Navbar.js

diff --git a/Roo/bootstrap/Navbar.js b/Roo/bootstrap/Navbar.js
index f6a2f32..926eb3c 100644 (file)
--- a/Roo/bootstrap/Navbar.js
+++ b/Roo/bootstrap/Navbar.js
@@ -52,9 +52,28 @@ Roo.extend(Roo.bootstrap.Navbar, Roo.bootstrap.Component,  {
             if(this.fireEvent('beforetoggle', this) !== false){
                 var ce = this.el.select('.navbar-collapse',true).first();
                 ce.toggleClass('in'); // old...
-               
-               
-               this.el.select('.navbar-collapse',true).toggleClass('collapse');
+                if (ce.hasClass('collapse')) {
+                    // show it...
+                    ce.removeClass('collapse');
+                    ce.addClass('show');
+                    
+                        ce.setHeight(ce.getHeight()); // resize it ...
+                        ce.removeClass('collapsing');
+                        ce.addClass('collapsing');
+                    
+                    // now flag it as moving..
+                    
+                    
+                    (function() { ce.removeClass('collapsing'); }).defer(500);
+                } else {
+                    ce.addClass('collapsing');
+                    ce.removeClass('show');
+                    (function() {
+                        ce.removeClass('collapsing');
+                        ce.addClass('collapse');
+                    }).defer(200);
+                    
+                }
             }
             
         }, this);