Roo/bootstrap/Navbar.js

[roojs1] / Roo / bootstrap / Navbar.js

diff --git a/Roo/bootstrap/Navbar.js b/Roo/bootstrap/Navbar.js
index 33f38bb..926eb3c 100644 (file)
--- a/Roo/bootstrap/Navbar.js
+++ b/Roo/bootstrap/Navbar.js
@@ -53,15 +53,25 @@ Roo.extend(Roo.bootstrap.Navbar, Roo.bootstrap.Component,  {
                 var ce = this.el.select('.navbar-collapse',true).first();
                 ce.toggleClass('in'); // old...
                 if (ce.hasClass('collapse')) {
+                    // show it...
                     ce.removeClass('collapse');
-                    ce.addClass('collapsing');
-                    (function() { ce.removeClass('collapsing'); }).defer(100);
+                    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(500);
+                    }).defer(200);
                     
                 }
             }