projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
69be017
)
Roo/bootstrap/NavItem.js
author
edward
<edward@roojs.com>
Thu, 29 Oct 2015 05:05:31 +0000
(13:05 +0800)
committer
edward
<edward@roojs.com>
Thu, 29 Oct 2015 05:05:31 +0000
(13:05 +0800)
Roo/bootstrap/NavItem.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/NavItem.js
b/Roo/bootstrap/NavItem.js
index
e74d9ab
..
7a85d53
100644
(file)
--- a/
Roo/bootstrap/NavItem.js
+++ b/
Roo/bootstrap/NavItem.js
@@
-167,11
+167,6
@@
Roo.extend(Roo.bootstrap.NavItem, Roo.bootstrap.Component, {
return;
}
- if(this.animateRef && this.href.charAt(0) == '#'){
- this.scrollToElement(e);
- return;
- }
-
var p = this.parent();
if (['tabs','pills'].indexOf(p.type)!==-1) {
if (typeof(p.setActiveItem) !== 'undefined') {
@@
-184,6
+179,11
@@
Roo.extend(Roo.bootstrap.NavItem, Roo.bootstrap.Component, {
p.parent().el.select('.navbar-collapse',true).removeClass('in');
}
+ if(this.animateRef && this.href.charAt(0) == '#'){
+ this.scrollToElement(e);
+ return;
+ }
+
},
isActive: function () {