diff options
| author | Pierre-Denis Vanduynslager <[email protected]> | 2017-01-06 15:57:15 -0500 |
|---|---|---|
| committer | Pierre-Denis Vanduynslager <[email protected]> | 2017-01-06 15:57:15 -0500 |
| commit | 4c2f5443596c39c551ebb7ec635d01a98e434189 (patch) | |
| tree | 3bb7d0a5bcd80e2758578c8d597c7554d7fd4b0c /js/src/scrollspy.js | |
| parent | eb84c03ddf5993d701724250507055b4e394fbdb (diff) | |
| parent | 65ffb1c3b6e94440812a2e228cb8e8be512652ec (diff) | |
| download | bootstrap-4c2f5443596c39c551ebb7ec635d01a98e434189.tar.xz bootstrap-4c2f5443596c39c551ebb7ec635d01a98e434189.zip | |
Merge branch 'twbs/v4-dev' into dropdown-keyboard
Diffstat (limited to 'js/src/scrollspy.js')
| -rw-r--r-- | js/src/scrollspy.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/src/scrollspy.js b/js/src/scrollspy.js index 0a4708bf9..66b6080c8 100644 --- a/js/src/scrollspy.js +++ b/js/src/scrollspy.js @@ -3,7 +3,7 @@ import Util from './util' /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.5): scrollspy.js + * Bootstrap (v4.0.0-alpha.6): scrollspy.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ const ScrollSpy = (($) => { */ const NAME = 'scrollspy' - const VERSION = '4.0.0-alpha.5' + const VERSION = '4.0.0-alpha.6' const DATA_KEY = 'bs.scrollspy' const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' @@ -186,7 +186,7 @@ const ScrollSpy = (($) => { _getScrollTop() { return this._scrollElement === window ? - this._scrollElement.scrollY : this._scrollElement.scrollTop + this._scrollElement.pageYOffset : this._scrollElement.scrollTop } _getScrollHeight() { |