From: Alan Knowles Date: Thu, 29 Nov 2018 05:13:22 +0000 (+0800) Subject: Roo/bootstrap/Navbar.js X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=34018f7208dd08d3b043bfb3b30fd2bccd76453d Roo/bootstrap/Navbar.js roojs-bootstrap.js roojs-bootstrap-debug.js --- diff --git a/Roo/bootstrap/Navbar.js b/Roo/bootstrap/Navbar.js index c6aedacae2..bccb87188d 100644 --- a/Roo/bootstrap/Navbar.js +++ b/Roo/bootstrap/Navbar.js @@ -70,7 +70,7 @@ Roo.extend(Roo.bootstrap.Navbar, Roo.bootstrap.Component, { ce.dom.style.height = ''; }).defer(500); - ce.setHeight(h) + ce.setHeight(h); } else { ce.addClass('collapsing'); diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index b8a2df7200..c2073aa434 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -3881,7 +3881,7 @@ Roo.extend(Roo.bootstrap.Navbar, Roo.bootstrap.Component, { ce.dom.style.height = ''; }).defer(500); - ce.setHeight(h) + ce.setHeight(h); } else { ce.addClass('collapsing'); diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index 0e8aad851b..d59e9cf237 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -152,7 +152,7 @@ Roo.MessageBox=Roo.MessageBox||Roo.bootstrap.MessageBox;Roo.Msg=Roo.Msg||Roo.Mes // 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'); -ce.addClass('collapsing');var h=ce.getHeight();ce.setHeight(0);(function(){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'); +ce.addClass('collapsing');var h=ce.getHeight();ce.setHeight(0);(function(){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(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(); }});