From 6d78cf511e7328e408e11800f880197075511e01 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Thu, 29 Nov 2018 12:56:28 +0800 Subject: [PATCH] Roo/bootstrap/Navbar.js roojs-bootstrap.js roojs-bootstrap-debug.js --- Roo/bootstrap/Navbar.js | 3 +-- roojs-bootstrap-debug.js | 2 +- roojs-bootstrap.js | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Roo/bootstrap/Navbar.js b/Roo/bootstrap/Navbar.js index 112fc757ae..290e67b480 100644 --- a/Roo/bootstrap/Navbar.js +++ b/Roo/bootstrap/Navbar.js @@ -59,12 +59,11 @@ Roo.extend(Roo.bootstrap.Navbar, Roo.bootstrap.Component, { (function() { ce.removeClass('collapsing'); }).defer(50); } else { ce.addClass('collapsing'); - e.addClass('collapse'); ce.removeClass('show'); (function() { ce.removeClass('collapsing'); ce.addClass('collapse'); - }).defer(500); + }).defer(1000); } } diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index 056bcb8997..10ed5b90b6 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -3874,7 +3874,7 @@ Roo.extend(Roo.bootstrap.Navbar, Roo.bootstrap.Component, { (function() { ce.removeClass('collapsing'); ce.addClass('collapse'); - }).defer(500); + }).defer(1000); } } diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index f00f2b5b54..35e8ee421c 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 show');(function(){ce.removeClass('collapsing');}).defer(50);}else{ce.addClass('collapsing');ce.removeClass('show');(function(){ce.removeClass('collapsing');ce.addClass('collapse');}).defer(500);}}},this);var A={tag:"div",cls:"x-dlg-mask"} +ce.addClass('collapsing show');(function(){ce.removeClass('collapsing');}).defer(50);}else{ce.addClass('collapsing');ce.removeClass('show');(function(){ce.removeClass('collapsing');ce.addClass('collapse');}).defer(1000);}}},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 -- 2.39.2