docs/Roo.docs.template.js

[roojs1] / roojs-bootstrap-debug.js

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index bf0f2b1..8495ec6 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();
@@ -3938,7 +3938,12 @@ Roo.extend(Roo.bootstrap.Navbar, Roo.bootstrap.Component,  {
      */
     expand : function ()
     {
+       
         var ce = this.el.select('.navbar-collapse',true).first();
+        if (ce.hasClass('collapsing')) {
+            return;
+        }
+        ce.dom.style.height = '';
                // show it...
         ce.addClass('in'); // old...
         ce.removeClass('collapse');
@@ -3959,13 +3964,19 @@ Roo.extend(Roo.bootstrap.Navbar, Roo.bootstrap.Component,  {
             ce.dom.style.height = '';
         }, this, { single: true} );
         ce.setHeight(h);
+        ce.dom.scrollTop = 0;
     },
     /**
      * Collapse the navbar pulldown 
      */
     collapse : function()
     {
-        var ce = this.el.select('.navbar-collapse',true).first();
+         var ce = this.el.select('.navbar-collapse',true).first();
+       
+        if (ce.hasClass('collapsing') || ce.hasClass('collapse') ) {
+            // it's collapsed or collapsing..
+            return;
+        }
         ce.removeClass('in'); // old...
         ce.setHeight(ce.getHeight());
         ce.removeClass('show');