aboutsummaryrefslogtreecommitdiff
path: root/js/src/scrollspy.js
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-10-16 19:46:47 -0700
committerMark Otto <[email protected]>2016-10-16 19:46:47 -0700
commitb4cdccba84f7681e2911d307828c5ce94c856736 (patch)
treef8e1edddbd941adb255766889019248ffa399d0a /js/src/scrollspy.js
parent05bdecd0b09a007ae949f49fdff9006650c06969 (diff)
parent6d6538fc81ebdb9e29ca5a5a4e8e5768b9358fe9 (diff)
downloadbootstrap-b4cdccba84f7681e2911d307828c5ce94c856736.tar.xz
bootstrap-b4cdccba84f7681e2911d307828c5ce94c856736.zip
Merge branch 'v4-dev' into v4-navbars
Diffstat (limited to 'js/src/scrollspy.js')
-rw-r--r--js/src/scrollspy.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/js/src/scrollspy.js b/js/src/scrollspy.js
index b9186db00..a664090fb 100644
--- a/js/src/scrollspy.js
+++ b/js/src/scrollspy.js
@@ -3,7 +3,7 @@ import Util from './util'
/**
* --------------------------------------------------------------------------
- * Bootstrap (v4.0.0-alpha.2): scrollspy.js
+ * Bootstrap (v4.0.0-alpha.4): 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.2'
+ const VERSION = '4.0.0-alpha.4'
const DATA_KEY = 'bs.scrollspy'
const EVENT_KEY = `.${DATA_KEY}`
const DATA_API_KEY = '.data-api'
@@ -140,6 +140,7 @@ const ScrollSpy = (($) => {
targetSelector
]
}
+ return null
})
.filter((item) => item)
.sort((a, b) => a[0] - b[0])