Roo/bootstrap/Button.js
authorAlan Knowles <alan@roojs.com>
Thu, 15 May 2014 08:36:08 +0000 (16:36 +0800)
committerAlan Knowles <alan@roojs.com>
Thu, 15 May 2014 08:36:08 +0000 (16:36 +0800)
Roo/bootstrap/Button.js

index 475349f..19e15ee 100644 (file)
@@ -163,7 +163,7 @@ Roo.extend(Roo.bootstrap.Button, Roo.bootstrap.Component,  {
         cfg.cls += this.size.length ? (' btn-' + this.size) : '';
          
         //gsRoo.log(this.parentType);
-        if (this.parentType === 'Navbar') {
+        if (this.parentType === 'Navbar' && !this.parent().bar) {
             Roo.log('changing to li?');
             
             cfg.tag = 'li';