kotovalexarian-likes-github
/
twbs--bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Releases Activity

allow for pushstate in scrollspy

This commit is contained in:
Jacob Thornton 2012-04-18 13:35:14 -07:00
parent b627898919
commit bc07e2adae
4 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/assets/js/bootstrap-scrollspy.js vendored
View File

@ -54,7 +54,8 @@
$targets = this.$body
.find(this.selector)
.map(function () {
var href = $(this).attr('href')
var $el = $(this)
, href = $el.data('target') || $el.attr('href')
, $href = /^#\w/.test(href) && $(href)
return ( $href
&& href.length
@ -91,6 +92,7 @@
, activate: function (target) {
var active
, selector
this.activeTarget = target
@ -98,7 +100,11 @@
.parent('.active')
.removeClass('active')
active = $(this.selector + '[href="' + target + '"]')
selector = this.selector
+ '[data-target="' + target + '"],'
+ this.selector + '[href="' + target + '"]'
active = $(selector)
.parent('li')
.addClass('active')

10
docs/assets/js/bootstrap.js vendored
View File

@ -1309,7 +1309,8 @@
$targets = this.$body
.find(this.selector)
.map(function () {
var href = $(this).attr('href')
var $el = $(this)
, href = $el.data('target') || $el.attr('href')
, $href = /^#\w/.test(href) && $(href)
return ( $href
&& href.length
@ -1346,6 +1347,7 @@
, activate: function (target) {
var active
, selector
this.activeTarget = target
@ -1353,7 +1355,11 @@
.parent('.active')
.removeClass('active')
active = $(this.selector + '[href="' + target + '"]')
selector = this.selector
+ '[data-target="' + target + '"],'
+ this.selector + '[href="' + target + '"]'
active = $(selector)
.parent('li')
.addClass('active')

2
docs/assets/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
js/bootstrap-scrollspy.js vendored
View File

@ -54,7 +54,8 @@
$targets = this.$body
.find(this.selector)
.map(function () {
var href = $(this).attr('href')
var $el = $(this)
, href = $el.data('target') || $el.attr('href')
, $href = /^#\w/.test(href) && $(href)
return ( $href
&& href.length
@ -91,6 +92,7 @@
, activate: function (target) {
var active
, selector
this.activeTarget = target
@ -98,7 +100,11 @@
.parent('.active')
.removeClass('active')
active = $(this.selector + '[href="' + target + '"]')
selector = this.selector
+ '[data-target="' + target + '"],'
+ this.selector + '[href="' + target + '"]'
active = $(selector)
.parent('li')
.addClass('active')