docs/src/Roo.js.html.LULNVZ

author Alan Knowles <alan@roojs.com>

Tue, 15 Jan 2019 03:08:30 +0000 (11:08 +0800)

committer Alan Knowles <alan@roojs.com>

Tue, 15 Jan 2019 03:08:30 +0000 (11:08 +0800)
author Alan Knowles <alan@roojs.com>
Tue, 15 Jan 2019 03:08:30 +0000 (11:08 +0800)
committer Alan Knowles <alan@roojs.com>
Tue, 15 Jan 2019 03:08:30 +0000 (11:08 +0800)
diff --git a/docs/src/Roo_bootstrap_Navbar.js.html b/docs/src/Roo_bootstrap_Navbar.js.html

index 99fc273..9c2c71d 100644 (file)
--- a/docs/src/Roo_bootstrap_Navbar.js.html
+++ b/docs/src/Roo_bootstrap_Navbar.js.html
@@ -94,7 +94,7 @@
          }
          </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">ce </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">this.el.select</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'.navbar-collapse'</span><span class="jsdoc-syntax">,</span><span class="jsdoc-keyword">true</span><span class="jsdoc-syntax">)</span><span class="jsdoc-var">.first</span><span class="jsdoc-syntax">();
  
-        </span><span class="jsdoc-keyword">if </span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">ce.hasClass</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'collapse'</span><span class="jsdoc-syntax">)) {
+        </span><span class="jsdoc-keyword">if </span><span class="jsdoc-syntax">(!</span><span class="jsdoc-var">ce.hasClass</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'show'</span><span class="jsdoc-syntax">)) {
             </span><span class="jsdoc-var">this.expand</span><span class="jsdoc-syntax">();
          } </span><span class="jsdoc-keyword">else </span><span class="jsdoc-syntax">{
              </span><span class="jsdoc-var">this.collapse</span><span class="jsdoc-syntax">();
diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js

index bf0f2b1..f35219c 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -3924,7 +3924,7 @@ Roo.extend(Roo.bootstrap.Navbar, Roo.bootstrap.Component,  {
          }
          var ce = this.el.select('.navbar-collapse',true).first();
        
-        if (ce.hasClass('collapse')) {
+        if (!ce.hasClass('show')) {
             this.expand();
          } else {
              this.collapse();
diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js

index 643e556..9b77cfc 100644 (file)
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -155,7 +155,7 @@ Roo.Msg=Roo.Msg||Roo.MessageBox;
  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',this.onToggle,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&&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();
-},onToggle:function(){if(this.fireEvent('beforetoggle',this)===false){return;}var ce=this.el.select('.navbar-collapse',true).first();if(ce.hasClass('collapse')){this.expand();}else{this.collapse();}},expand:function(){var ce=this.el.select('.navbar-collapse',true).first();
+},onToggle:function(){if(this.fireEvent('beforetoggle',this)===false){return;}var ce=this.el.select('.navbar-collapse',true).first();if(!ce.hasClass('show')){this.expand();}else{this.collapse();}},expand:function(){var ce=this.el.select('.navbar-collapse',true).first();
  ce.addClass('in');ce.removeClass('collapse');ce.addClass('show');var h=ce.getHeight();Roo.log(h);ce.removeClass('show');ce.addClass('collapsing');ce.setHeight(0);ce.on('transitionend',function(){ce.removeClass('collapsing');ce.addClass('show');ce.removeClass('collapse');
  ce.dom.style.height='';},this,{single:true});ce.setHeight(h);},collapse:function(){var ce=this.el.select('.navbar-collapse',true).first();ce.removeClass('in');ce.setHeight(ce.getHeight());ce.removeClass('show');ce.addClass('collapsing');ce.on('transitionend',function(){ce.dom.style.height='';
  ce.removeClass('collapsing');ce.addClass('collapse');},this,{single:true});ce.setHeight(0);}});
author	Alan Knowles <alan@roojs.com>
	Tue, 15 Jan 2019 03:08:30 +0000 (11:08 +0800)
committer	Alan Knowles <alan@roojs.com>
	Tue, 15 Jan 2019 03:08:30 +0000 (11:08 +0800)
docs/src/Roo_bootstrap_Navbar.js.html		patch \| blob \| history
roojs-bootstrap-debug.js		patch \| blob \| history
roojs-bootstrap.js		patch \| blob \| history