mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-20 20:00:36 +03:00
Code Activity

grunt

Browse Source
This commit is contained in:
Heinrich Fenkart
2014-10-26 03:17:19 +01:00
parent 0e991ccba2
commit 44cc763229
6 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/js/bootstrap.js
Vendored
+10 -5
View File
@@ -1821,8 +1821,9 @@ if (typeof jQuery === 'undefined') {
return activeTarget != (i = targets[targets.length - 1]) && this.activate(i) return activeTarget != (i = targets[targets.length - 1]) && this.activate(i)
} }
if (activeTarget && scrollTop <= offsets[0]) { if (activeTarget && scrollTop < offsets[0]) {
return activeTarget != (i = targets[0]) && this.activate(i) this.activeTarget = null
return this.clear()
} }
for (i = offsets.length; i--;) { for (i = offsets.length; i--;) {
@@ -1836,9 +1837,7 @@ if (typeof jQuery === 'undefined') {
ScrollSpy.prototype.activate = function (target) { ScrollSpy.prototype.activate = function (target) {
this.activeTarget = target this.activeTarget = target
$(this.selector) this.clear()
.parentsUntil(this.options.target, '.active')
.removeClass('active')
var selector = this.selector + var selector = this.selector +
'[data-target="' + target + '"],' + '[data-target="' + target + '"],' +
@@ -1857,6 +1856,12 @@ if (typeof jQuery === 'undefined') {
active.trigger('activate.bs.scrollspy') active.trigger('activate.bs.scrollspy')
} }
ScrollSpy.prototype.clear = function () {
$(this.selector)
.parentsUntil(this.options.target, '.active')
.removeClass('active')
}
// SCROLLSPY PLUGIN DEFINITION // SCROLLSPY PLUGIN DEFINITION
// =========================== // ===========================
dist/js/bootstrap.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/assets/js/customize.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/assets/js/raw-files.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/js/bootstrap.js
Vendored
+10 -5
View File
@@ -1821,8 +1821,9 @@ if (typeof jQuery === 'undefined') {
return activeTarget != (i = targets[targets.length - 1]) && this.activate(i) return activeTarget != (i = targets[targets.length - 1]) && this.activate(i)
} }
if (activeTarget && scrollTop <= offsets[0]) { if (activeTarget && scrollTop < offsets[0]) {
return activeTarget != (i = targets[0]) && this.activate(i) this.activeTarget = null
return this.clear()
} }
for (i = offsets.length; i--;) { for (i = offsets.length; i--;) {
@@ -1836,9 +1837,7 @@ if (typeof jQuery === 'undefined') {
ScrollSpy.prototype.activate = function (target) { ScrollSpy.prototype.activate = function (target) {
this.activeTarget = target this.activeTarget = target
$(this.selector) this.clear()
.parentsUntil(this.options.target, '.active')
.removeClass('active')
var selector = this.selector + var selector = this.selector +
'[data-target="' + target + '"],' + '[data-target="' + target + '"],' +
@@ -1857,6 +1856,12 @@ if (typeof jQuery === 'undefined') {
active.trigger('activate.bs.scrollspy') active.trigger('activate.bs.scrollspy')
} }
ScrollSpy.prototype.clear = function () {
$(this.selector)
.parentsUntil(this.options.target, '.active')
.removeClass('active')
}
// SCROLLSPY PLUGIN DEFINITION // SCROLLSPY PLUGIN DEFINITION
// =========================== // ===========================
docs/dist/js/bootstrap.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long