diff options
| author | Mark Otto <[email protected]> | 2016-12-24 14:29:41 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-12-24 14:29:41 -0800 |
| commit | cd18ee8af693755798eb9d20dfc82a350996c04b (patch) | |
| tree | c2ff8517fc41688230f15aa978e3f903289c27d3 /docs/dist/js/bootstrap.js | |
| parent | 43ef8b129e6a2d74408b22d55c213d781f9e929a (diff) | |
| download | bootstrap-cd18ee8af693755798eb9d20dfc82a350996c04b.tar.xz bootstrap-cd18ee8af693755798eb9d20dfc82a350996c04b.zip | |
grunt
Diffstat (limited to 'docs/dist/js/bootstrap.js')
| -rw-r--r-- | docs/dist/js/bootstrap.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js index dbf9064e8..b77bb41ad 100644 --- a/docs/dist/js/bootstrap.js +++ b/docs/dist/js/bootstrap.js @@ -750,13 +750,14 @@ var Carousel = function ($) { if (/input|textarea/i.test(event.target.tagName)) { return; } - event.preventDefault(); switch (event.which) { case ARROW_LEFT_KEYCODE: + event.preventDefault(); this.prev(); break; case ARROW_RIGHT_KEYCODE: + event.preventDefault(); this.next(); break; default: @@ -2395,7 +2396,7 @@ var ScrollSpy = function ($) { } else { // todo (fat) this is kinda sus... // recursively add actives to tested nav-links - $link.parents(Selector.LI).find(Selector.NAV_LINKS).addClass(ClassName.ACTIVE); + $link.parents(Selector.LI).find('> ' + Selector.NAV_LINKS).addClass(ClassName.ACTIVE); } $(this._scrollElement).trigger(Event.ACTIVATE, { |