Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev

2 files changed, 9 insertions, 4 deletions

diff --git a/js/src/carousel.js b/js/src/carousel.js
index f990c699a..e24aed08f 100644
--- a/js/src/carousel.js
+++ b/js/src/carousel.js
@@ -238,9 +238,14 @@ const Carousel = (($) => {
       }
 
       switch (event.which) {
-        case ARROW_LEFT_KEYCODE: this.prev(); break
-        case ARROW_RIGHT_KEYCODE: this.next(); break
-        default: return
+        case ARROW_LEFT_KEYCODE:
+          this.prev()
+          break
+        case ARROW_RIGHT_KEYCODE:
+          this.next()
+          break
+        default:
+          return
       }
     }
 
diff --git a/js/src/util.js b/js/src/util.js
index b779c448f..86d9fe1f4 100644
--- a/js/src/util.js
+++ b/js/src/util.js
@@ -40,7 +40,7 @@ const Util = (($) => {
       delegateType: transition.end,
       handle(event) {
         if ($(event.target).is(this)) {
-          return event.handleObj.handler.apply(this, arguments)
+          return event.handleObj.handler.apply(this, arguments) // eslint-disable-line prefer-rest-params
         }
         return undefined
       }