aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohann-S <[email protected]>2016-02-01 00:06:07 +0100
committerJohann-S <[email protected]>2016-02-01 00:06:07 +0100
commit14ec4fdfc10a965477314078c1a9531a1d02fb8f (patch)
tree9355ea6785ca7bf0807a67151a51027624da05b8
parent6384789f952c297356a94aded5900d199d09ae87 (diff)
downloadbootstrap-14ec4fdfc10a965477314078c1a9531a1d02fb8f.tar.xz
bootstrap-14ec4fdfc10a965477314078c1a9531a1d02fb8f.zip
Carousel - Do not prevent on keydown for input and textarea
-rw-r--r--js/src/carousel.js3
-rw-r--r--js/tests/unit/carousel.js32
2 files changed, 33 insertions, 2 deletions
diff --git a/js/src/carousel.js b/js/src/carousel.js
index 34cab4391..0ed4b7b5f 100644
--- a/js/src/carousel.js
+++ b/js/src/carousel.js
@@ -229,11 +229,10 @@ const Carousel = (($) => {
}
_keydown(event) {
- event.preventDefault()
-
if (/input|textarea/i.test(event.target.tagName)) {
return
}
+ event.preventDefault()
switch (event.which) {
case 37: this.prev(); break
diff --git a/js/tests/unit/carousel.js b/js/tests/unit/carousel.js
index d6d0186e1..8fac87d98 100644
--- a/js/tests/unit/carousel.js
+++ b/js/tests/unit/carousel.js
@@ -759,4 +759,36 @@ $(function () {
.bootstrapCarousel('prev')
assert.strictEqual($carousel.find('.carousel-item.active').attr('id'), 'one', 'carousel did not wrap around and stayed on 1st slide')
})
+
+ QUnit.test('should not prevent keydown for inputs and textareas', function (assert) {
+ assert.expect(2)
+ var templateHTML = '<div id="myCarousel" class="carousel" data-interval="false">'
+ + '<div class="carousel-inner">'
+ + '<div id="first" class="carousel-item">'
+ + '<input type="text" id="inputText" />'
+ + '</div>'
+ + '<div id="second" class="carousel-item active">'
+ + '<textarea id="txtArea"></textarea>'
+ + '</div>'
+ + '</div>'
+ + '</div>'
+ var $template = $(templateHTML)
+ var done = assert.async()
+ $template.appendTo('#qunit-fixture')
+ var $inputText = $template.find('#inputText')
+ var $textArea = $template.find('#txtArea')
+ $template.bootstrapCarousel()
+
+ var eventKeyDown = $.Event('keydown', { which: 65 }) // 65 for "a"
+ $inputText.on('keydown', function (event) {
+ assert.strictEqual(event.isDefaultPrevented(), false)
+ })
+ $inputText.trigger(eventKeyDown)
+
+ $textArea.on('keydown', function (event) {
+ assert.strictEqual(event.isDefaultPrevented(), false)
+ done()
+ })
+ $textArea.trigger(eventKeyDown)
+ })
})