roojs-bootstrap.js

[roojs1] / roojs-bootstrap-debug.js

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 10ed5b9..de8bf39 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -3866,15 +3866,32 @@ Roo.extend(Roo.bootstrap.Navbar, Roo.bootstrap.Component,  {
                 if (ce.hasClass('collapse')) {
                     // show it...
                     ce.removeClass('collapse');
-                    ce.addClass('collapsing show');
-                    (function() { ce.removeClass('collapsing'); }).defer(50);
+                    ce.addClass('show');
+                    var h = ce.getHeight();
+                    Roo.log(h);
+                    ce.removeClass('show');
+                    // at this point we should be able to see it..
+                    ce.addClass('collapsing');
+                    
+                    ce.setHeight(0); // resize it ...
+                     (function() {
+                        Roo.log('done transition');
+                        ce.removeClass('collapsing');
+                        ce.addClass('show');
+                        ce.removeClass('collapse');
+
+                        ce.dom.style.height = '';
+                    }).defer(500);
+                    ce.setHeight(h);
+                    
                 } else {
                     ce.addClass('collapsing');
                     ce.removeClass('show');
                     (function() {
                         ce.removeClass('collapsing');
                         ce.addClass('collapse');
-                    }).defer(1000);
+                        
+                    }).defer(200);
                     
                 }
             }