Skip to content

Commit

Permalink
Roo/bootstrap/NavItem.js
Browse files Browse the repository at this point in the history
  • Loading branch information
roojs committed Nov 26, 2015
1 parent 0b84dc3 commit a9ddd01
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions Roo/bootstrap/NavItem.js
Expand Up @@ -160,7 +160,7 @@ Roo.extend(Roo.bootstrap.NavItem, Roo.bootstrap.Component, {



Roo.log("fire event clicked");
//Roo.log("fire event clicked");
if(this.fireEvent('click', this, e) === false){
return;
};
Expand All @@ -170,12 +170,12 @@ Roo.extend(Roo.bootstrap.NavItem, Roo.bootstrap.Component, {
}
var p = this.parent();

Roo.log(this.href);
//Roo.log(this.href);
var ael = this.el.select('a',true).first();
Roo.log(ael);
//Roo.log(ael);

if(ael && this.animateRef && this.href.indexOf('#') > -1){
Roo.log(["test:",ael.dom.href.split("#")[0], document.location.toString().split("#")[0]]);
//Roo.log(["test:",ael.dom.href.split("#")[0], document.location.toString().split("#")[0]]);
if (ael.dom.href.split("#")[0] != document.location.toString().split("#")[0]) {
return; // ignore... - it's a 'hash' to another page.
}
Expand All @@ -185,10 +185,7 @@ Roo.extend(Roo.bootstrap.NavItem, Roo.bootstrap.Component, {
}







if (['tabs','pills'].indexOf(this.type)!==-1) {
if (typeof(p.setActiveItem) !== 'undefined') {
p.setActiveItem(this);
Expand Down

0 comments on commit a9ddd01

Please sign in to comment.