]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge pull request #19058 from Johann-S/carouselInput
authorMark Otto <markd.otto@gmail.com>
Sat, 26 Nov 2016 09:14:55 +0000 (01:14 -0800)
committerGitHub <noreply@github.com>
Sat, 26 Nov 2016 09:14:55 +0000 (01:14 -0800)
Carousel - Do not prevent on keydown for input and textarea

1  2 
js/src/carousel.js
js/tests/unit/carousel.js

index b7f3b3a7a9115ba3c9fde9e5de335232c241274d,0ed4b7b5fe34cd7d7a9aab9dd17187d48e60bfb0..d85082ce57c9af36e18a6bcd3bd2d8c2aeb8aeec
@@@ -235,18 -232,12 +235,17 @@@ const Carousel = (($) => 
        if (/input|textarea/i.test(event.target.tagName)) {
          return
        }
+       event.preventDefault()
  
        switch (event.which) {
 -        case 37: this.prev(); break
 -        case 39: this.next(); break
 -        default: return
 +        case ARROW_LEFT_KEYCODE:
 +          this.prev()
 +          break
 +        case ARROW_RIGHT_KEYCODE:
 +          this.next()
 +          break
 +        default:
 +          return
        }
      }
  
Simple merge