Roo/bootstrap/Navbar.js

roojs-bootstrap.js
roojs-bootstrap-debug.js

diff --git a/Roo/bootstrap/Navbar.js b/Roo/bootstrap/Navbar.js
index b6e0620..11b50c2 100644 (file)
--- a/Roo/bootstrap/Navbar.js
+++ b/Roo/bootstrap/Navbar.js
@@ -54,12 +54,12 @@ Roo.extend(Roo.bootstrap.Navbar, Roo.bootstrap.Component,  {
                 ce.toggleClass('in'); // old...
                 if (ce.hasClass('collapse')) {
                     // show it...
-                    ce.removeClass('collapse show');
-                    (function() {
+                    ce.removeClass('collapse');
+                    ce.addClass('show');
+                    
                         ce.setHeight(ce.getHeight()); // resize it ...
                         ce.removeClass('collapsing');
                         ce.addClass('collapsing');
-                    }).defer(50);
                     
                     // now flag it as moving..
                     

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 5b2c675..4469dc6 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -3865,12 +3865,12 @@ Roo.extend(Roo.bootstrap.Navbar, Roo.bootstrap.Component,  {
                 ce.toggleClass('in'); // old...
                 if (ce.hasClass('collapse')) {
                     // show it...
-                    ce.removeClass('collapse show');
-                    (function() {
+                    ce.removeClass('collapse');
+                    ce.addClass('show');
+                    
                         ce.setHeight(ce.getHeight()); // resize it ...
                         ce.removeClass('collapsing');
                         ce.addClass('collapsing');
-                    }).defer(50);
                     
                     // now flag it as moving..
                     

diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index 7ae463f..5d8e135 100644 (file)
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -151,8 +151,8 @@ this.updateText(B.msg);if(B.cls){d.el.addClass(B.cls);}d.proxyDrag=B.proxyDrag==
 Roo.MessageBox=Roo.MessageBox||Roo.bootstrap.MessageBox;Roo.Msg=Roo.Msg||Roo.MessageBox;
 // Roo/bootstrap/Navbar.js
 Roo.bootstrap.Navbar=function(A){Roo.bootstrap.Navbar.superclass.constructor.call(this,A);this.addEvents({"beforetoggle":true});};Roo.extend(Roo.bootstrap.Navbar,Roo.bootstrap.Component,{navItems:false,loadMask:false,getAutoCreate:function(){throw {message:"nav bar is now a abstract base class - use NavSimplebar / NavHeaderbar / NavSidebar etc..."}
-;},initEvents:function(){this.el.select('.navbar-toggle',true).on('click',function(){if(this.fireEvent('beforetoggle',this)!==false){var ce=this.el.select('.navbar-collapse',true).first();ce.toggleClass('in');if(ce.hasClass('collapse')){ce.removeClass('collapse show');
-(function(){ce.setHeight(ce.getHeight());ce.removeClass('collapsing');ce.addClass('collapsing');}).defer(50);(function(){ce.removeClass('collapsing');}).defer(100);}else{ce.addClass('collapsing');ce.removeClass('show');(function(){ce.removeClass('collapsing');
+;},initEvents:function(){this.el.select('.navbar-toggle',true).on('click',function(){if(this.fireEvent('beforetoggle',this)!==false){var ce=this.el.select('.navbar-collapse',true).first();ce.toggleClass('in');if(ce.hasClass('collapse')){ce.removeClass('collapse');
+ce.addClass('show');ce.setHeight(ce.getHeight());ce.removeClass('collapsing');ce.addClass('collapsing');(function(){ce.removeClass('collapsing');}).defer(100);}else{ce.addClass('collapsing');ce.removeClass('show');(function(){ce.removeClass('collapsing');
 ce.addClass('collapse');}).defer(200);}}},this);var A={tag:"div",cls:"x-dlg-mask"};this.maskEl=Roo.DomHelper.append(this.el,A,true);var B=this.el.getSize();this.maskEl.setSize(B.width,B.height);this.maskEl.enableDisplayMode("block");this.maskEl.hide();if(this.loadMask){this.maskEl.show();
 }},getChildContainer:function(){if(this.el.select('.collapse').getCount()){return this.el.select('.collapse',true).first();}return this.el;},mask:function(){this.maskEl.show();},unmask:function(){this.maskEl.hide();}});
 // Roo/bootstrap/NavSimplebar.js