mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-30 08:39:56 +02:00
Code Issues Releases Wiki Activity

Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Browse Source 
Conflicts:
	docs/less.html
This commit is contained in:
Mark Otto
2012-01-24 23:36:39 -08:00
parent 6ab56051fd 5d3175e84b
commit e555f38ae4
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/assets/js/application.js
View File

@@ -119,7 +119,7 @@ $(function(){
// fix sub nav playa // fix sub nav playa
var $win = $(window) var $win = $(window)
, $nav = $('.subnav') , $nav = $('.subnav')
, navTop = $('.subnav').offset().top - 40 , navTop = $('.subnav').length && $('.subnav').offset().top - 40
, isFixed = 0 , isFixed = 0
processScroll() processScroll()

15
js/bootstrap-scrollspy.js vendored
View File

@@ -26,10 +26,11 @@
function ScrollSpy( element, options) { function ScrollSpy( element, options) {
var process = $.proxy(this.process, this) var process = $.proxy(this.process, this)
, $element = $(element).is('body') ? $(window) : $(element)
this.options = $.extend({}, $.fn.scrollspy.defaults, options) this.options = $.extend({}, $.fn.scrollspy.defaults, options)
this.$scrollElement = $(element).on('scroll.scroll.data-api', process) this.$scrollElement = $element.on('scroll.scroll.data-api', process)
this.selector = (this.$scrollElement.attr('data-target') this.selector = (this.options.target
|| this.$scrollElement.attr('href') || $(element).attr('href')
|| '') + ' .nav li > a' || '') + ' .nav li > a'
this.$body = $('body').on('click.scroll.data-api', this.selector, process) this.$body = $('body').on('click.scroll.data-api', this.selector, process)
this.refresh() this.refresh()
@@ -111,11 +112,13 @@
/* SCROLLSPY DATA-API /* SCROLLSPY DATA-API
* ============== */ * ================== */
$(function () { $(function () {
var $spy = $('[data-spy="scroll"]') $('[data-spy="scroll"]').each(function () {
$spy.scrollspy($spy.data()) var $spy = $(this)
$spy.scrollspy($spy.data())
})
}) })
}( window.jQuery ) }( window.jQuery )