Roo/bootstrap/NavItem.js

Roo/bootstrap/NavGroup.js

diff --git a/Roo/bootstrap/NavGroup.js b/Roo/bootstrap/NavGroup.js
index f089cb9..b740883 100644 (file)
--- a/Roo/bootstrap/NavGroup.js
+++ b/Roo/bootstrap/NavGroup.js
@@ -113,15 +113,13 @@ Roo.extend(Roo.bootstrap.NavGroup, Roo.bootstrap.Component,  {
                 return ;
             }
             if (v.isActive()) {
-                Roo.log('isActive');
-                Roo.log(v);
-                v.setActive(false, true, true);
+                v.setActive(false, true);
                 prev = v;
                 
             }
             
         });
-        
+
         item.setActive(true, true);
         this.fireEvent('changed', this, item, prev);
         

diff --git a/Roo/bootstrap/NavItem.js b/Roo/bootstrap/NavItem.js
index 0af1dcd..9f32dd4 100644 (file)
--- a/Roo/bootstrap/NavItem.js
+++ b/Roo/bootstrap/NavItem.js
@@ -180,12 +180,6 @@ Roo.extend(Roo.bootstrap.NavItem, Roo.bootstrap.Component,  {
             }
             
         }
-        
-        if(is_was_active){
-            this.was_active = true;
-            return;
-        }
-        
         this.active = state;
         
         if (!state ) {
@@ -214,11 +208,8 @@ Roo.extend(Roo.bootstrap.NavItem, Roo.bootstrap.Component,  {
         // if we can not flip to new panel - go back to old nav highlight..
         if (false == tg.showPanel(pan)) {
             var nv = Roo.bootstrap.NavGroup.get(this.navId);
-            Roo.log('navGroup');
-            Roo.log(nv);
             if (nv) {
                 var onav = nv.getWasActive();
-                Roo.log(onav);
                 if (onav) {
                     onav.setActive(true, false, true);
                 }