allow for pushstate in scrollspy
This commit is contained in:
parent
b627898919
commit
bc07e2adae
|
@ -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')
|
||||
|
||||
|
|
|
@ -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')
|
||||
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -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')
|
||||
|
||||
|
|
Loading…
Reference in New Issue