diff options
| author | Mark Otto <[email protected]> | 2012-01-28 11:22:07 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-28 11:22:07 -0800 |
| commit | 245276825924acd0cfe5f4fd57b0f8b9970b64c3 (patch) | |
| tree | 5d803eec9195de7e19dac304f05eddd1895bc914 /js/bootstrap-scrollspy.js | |
| parent | 28ba9d69c82895bbd9a1d66cea855119f4aba349 (diff) | |
| parent | c2c02d104c5e5a96330cf00a727d62687d863e02 (diff) | |
| download | bootstrap-245276825924acd0cfe5f4fd57b0f8b9970b64c3.tar.xz bootstrap-245276825924acd0cfe5f4fd57b0f8b9970b64c3.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Diffstat (limited to 'js/bootstrap-scrollspy.js')
| -rw-r--r-- | js/bootstrap-scrollspy.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js index dcb52456e..e8bd0715c 100644 --- a/js/bootstrap-scrollspy.js +++ b/js/bootstrap-scrollspy.js @@ -27,10 +27,11 @@ function ScrollSpy( element, options) { var process = $.proxy(this.process, this) , $element = $(element).is('body') ? $(window) : $(element) + , href this.options = $.extend({}, $.fn.scrollspy.defaults, options) this.$scrollElement = $element.on('scroll.scroll.data-api', process) this.selector = (this.options.target - || $(element).attr('href') + || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 || '') + ' .nav li > a' this.$body = $('body').on('click.scroll.data-api', this.selector, process) this.refresh() |