mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-12 16:44:17 +02:00
Code Issues Releases Wiki Activity

Merge branch 'twbs/v4-dev' into dropdown-keyboard

Browse Source
This commit is contained in:
Pierre-Denis Vanduynslager
2017-01-15 10:33:54 -05:00
parent 4c2f544359 8fbd4aaa38
commit a85b80fa75
16 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
js/src/carousel.js
View File

@@ -137,7 +137,7 @@ const Carousel = (($) => {
if (this._isSliding) {
throw new Error('Carousel is sliding')
}
this._slide(Direction.PREVIOUS)
this._slide(Direction.PREV)
}
pause(event) {
@@ -195,7 +195,7 @@ const Carousel = (($) => {
const direction = index > activeIndex ?
Direction.NEXT :
Direction.PREVIOUS
Direction.PREV
this._slide(direction, this._items[index])
}
@@ -263,7 +263,7 @@ const Carousel = (($) => {
_getItemByDirection(direction, activeElement) {
const isNextDirection = direction === Direction.NEXT
const isPrevDirection = direction === Direction.PREVIOUS
const isPrevDirection = direction === Direction.PREV
const activeIndex = this._getItemIndex(activeElement)
const lastItemIndex = this._items.length - 1
const isGoingToWrap = isPrevDirection && activeIndex === 0 ||
@@ -273,7 +273,7 @@ const Carousel = (($) => {
return activeElement
}
const delta = direction === Direction.PREVIOUS ? -1 : 1
const delta = direction === Direction.PREV ? -1 : 1
const itemIndex = (activeIndex + delta) % this._items.length
return itemIndex === -1 ?

4
js/src/dropdown.js
View File

@@ -24,9 +24,11 @@ const Dropdown = (($) => {
const DATA_API_KEY = '.data-api'
const JQUERY_NO_CONFLICT = $.fn[NAME]
const ESCAPE_KEYCODE = 27 // KeyboardEvent.which value for Escape (Esc) key
const SPACE_KEYCODE = 32 // KeyboardEvent.which value for space key
const ARROW_UP_KEYCODE = 38 // KeyboardEvent.which value for up arrow key
const ARROW_DOWN_KEYCODE = 40 // KeyboardEvent.which value for down arrow key
const RIGHT_MOUSE_BUTTON_WHICH = 3 // MouseEvent.which value for the right button (assuming a right-handed mouse)
const REGEXP_KEYDOWN = new RegExp(`${ARROW_UP_KEYCODE}|${ARROW_DOWN_KEYCODE}|${ESCAPE_KEYCODE}|${SPACE_KEYCODE}`)
const Event = {
HIDE : `hide${EVENT_KEY}`,
@@ -211,7 +213,7 @@ const Dropdown = (($) => {
}
static _dataApiKeydownHandler(event) {
if (!/(38|40|27|32)/.test(event.which) ||
if (!REGEXP_KEYDOWN.test(event.which) ||
/input|textarea/i.test(event.target.tagName)) {
return
}

2
js/tests/visual/collapse.html
View File

@@ -10,7 +10,7 @@
<div class="container">
<h1>Collapse <small>Bootstrap Visual Test</small></h1>
<div id="accordion" role="tablist" aria-multiselectable="true">
<div id="accordion" role="tablist">
<div class="card">
<div class="card-header" role="tab" id="headingOne">
<h5 class="mb-0">

2
js/tests/visual/modal.html
View File

@@ -54,7 +54,7 @@
<h4>Tooltips in a modal</h4>
<p><a href="#" data-toggle="tooltip" data-placement="top" title="Tooltip on top">This link</a> and <a href="#" data-toggle="tooltip" data-placement="bottom" title="Tooltip on bottom">that link</a> should have tooltips on hover.</p>
<div id="accordion" role="tablist" aria-multiselectable="true">
<div id="accordion" role="tablist">
<div class="card">
<div class="card-header" role="tab" id="headingOne">
<h5 class="mb-0">