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

allow for pushstate in scrollspy

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/js/bootstrap-scrollspy.js
Vendored
+8 -2
View File
@@ -54,7 +54,8 @@
$targets = this.$body $targets = this.$body
.find(this.selector) .find(this.selector)
.map(function () { .map(function () {
var href = $(this).attr('href') var $el = $(this)
, href = $el.data('target') || $el.attr('href')
, $href = /^#\w/.test(href) && $(href) , $href = /^#\w/.test(href) && $(href)
return ( $href return ( $href
&& href.length && href.length
@@ -91,6 +92,7 @@
, activate: function (target) { , activate: function (target) {
var active var active
, selector
this.activeTarget = target this.activeTarget = target
@@ -98,7 +100,11 @@
.parent('.active') .parent('.active')
.removeClass('active') .removeClass('active')
active = $(this.selector + '[href="' + target + '"]') selector = this.selector
+ '[data-target="' + target + '"],'
+ this.selector + '[href="' + target + '"]'
active = $(selector)
.parent('li') .parent('li')
.addClass('active') .addClass('active')
docs/assets/js/bootstrap.js
Vendored
+8 -2
View File
@@ -1309,7 +1309,8 @@
$targets = this.$body $targets = this.$body
.find(this.selector) .find(this.selector)
.map(function () { .map(function () {
var href = $(this).attr('href') var $el = $(this)
, href = $el.data('target') || $el.attr('href')
, $href = /^#\w/.test(href) && $(href) , $href = /^#\w/.test(href) && $(href)
return ( $href return ( $href
&& href.length && href.length
@@ -1346,6 +1347,7 @@
, activate: function (target) { , activate: function (target) {
var active var active
, selector
this.activeTarget = target this.activeTarget = target
@@ -1353,7 +1355,11 @@
.parent('.active') .parent('.active')
.removeClass('active') .removeClass('active')
active = $(this.selector + '[href="' + target + '"]') selector = this.selector
+ '[data-target="' + target + '"],'
+ this.selector + '[href="' + target + '"]'
active = $(selector)
.parent('li') .parent('li')
.addClass('active') .addClass('active')
docs/assets/js/bootstrap.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
js/bootstrap-scrollspy.js
Vendored
+8 -2
View File
@@ -54,7 +54,8 @@
$targets = this.$body $targets = this.$body
.find(this.selector) .find(this.selector)
.map(function () { .map(function () {
var href = $(this).attr('href') var $el = $(this)
, href = $el.data('target') || $el.attr('href')
, $href = /^#\w/.test(href) && $(href) , $href = /^#\w/.test(href) && $(href)
return ( $href return ( $href
&& href.length && href.length
@@ -91,6 +92,7 @@
, activate: function (target) { , activate: function (target) {
var active var active
, selector
this.activeTarget = target this.activeTarget = target
@@ -98,7 +100,11 @@
.parent('.active') .parent('.active')
.removeClass('active') .removeClass('active')
active = $(this.selector + '[href="' + target + '"]') selector = this.selector
+ '[data-target="' + target + '"],'
+ this.selector + '[href="' + target + '"]'
active = $(selector)
.parent('li') .parent('li')
.addClass('active') .addClass('active')