X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2Fbootstrap%2FNavItem.js;h=a0dcf893acc723b15b1fac5d8b5174f580981089;hb=10e03422f03d0407d2f24efe6082580b2b460d2b;hp=bd1c06e613c53324ea508774947297913ecb11c6;hpb=ebcaa4f0158b5996e1fa29ded2750ffcccafce4d;p=roojs1 diff --git a/Roo/bootstrap/NavItem.js b/Roo/bootstrap/NavItem.js index bd1c06e613..a0dcf893ac 100644 --- a/Roo/bootstrap/NavItem.js +++ b/Roo/bootstrap/NavItem.js @@ -141,11 +141,16 @@ Roo.extend(Roo.bootstrap.NavItem, Roo.bootstrap.Component, { onClick : function(e) { + if (e.getTarget('.dropdown-menu-item')) { + // did you click on a menu itemm.... - then don't trigger onclick.. + return; + } + if( this.preventDefault || this.href == '#' ){ - + Roo.log("NavItem - prevent Default?"); e.preventDefault(); } @@ -179,7 +184,7 @@ Roo.extend(Roo.bootstrap.NavItem, Roo.bootstrap.Component, { if (ael.dom.href.split("#")[0] != document.location.toString().split("#")[0]) { return; // ignore... - it's a 'hash' to another page. } - + Roo.log("NavItem - prevent Default?"); e.preventDefault(); this.scrollToElement(e); }