From 68b771a057b60ca5740cf9a1b0f8f9ec73e5dc56 Mon Sep 17 00:00:00 2001
From: Ben-Russell <Ben-Russell@users.noreply.github.com>
Date: Tue, 26 Aug 2014 14:34:21 -0700
Subject: Independently delegate data-api selectors

Fixes #14462.
Closes #14463 by merging it.
---
 js/carousel.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'js/carousel.js')

diff --git a/js/carousel.js b/js/carousel.js
index b68899009..8884424ef 100644
--- a/js/carousel.js
+++ b/js/carousel.js
@@ -207,7 +207,7 @@
   // CAROUSEL DATA-API
   // =================
 
-  $(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
+  var clickHandler = function (e) {
     var href
     var $this   = $(this)
     var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7
@@ -223,7 +223,11 @@
     }
 
     e.preventDefault()
-  })
+  }
+
+  $(document)
+    .on('click.bs.carousel.data-api', '[data-slide]', clickHandler)
+    .on('click.bs.carousel.data-api', '[data-slide-to]', clickHandler)
 
   $(window).on('load', function () {
     $('[data-ride="carousel"]').each(function () {
-- 
cgit v1.2.3


From 94b59b57d6cae8ba6503b3040d361a4efda5cdc6 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Wed, 29 Oct 2014 08:56:20 -0700
Subject: version bump

---
 js/carousel.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js/carousel.js')

diff --git a/js/carousel.js b/js/carousel.js
index 8884424ef..4e4e47797 100644
--- a/js/carousel.js
+++ b/js/carousel.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: carousel.js v3.2.0
+ * Bootstrap: carousel.js v3.3.0
  * http://getbootstrap.com/javascript/#carousel
  * ========================================================================
  * Copyright 2011-2014 Twitter, Inc.
@@ -30,7 +30,7 @@
       .on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
   }
 
-  Carousel.VERSION  = '3.2.0'
+  Carousel.VERSION  = '3.3.0'
 
   Carousel.TRANSITION_DURATION = 600
 
-- 
cgit v1.2.3


From 469dc3ab1fb991027d073cd3ffe6907361b1f058 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Mon, 3 Nov 2014 18:35:35 -0800
Subject: Have Carousel ignore keyboard events from <input>s or <textarea>s;
 fixes #14991

---
 js/carousel.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'js/carousel.js')

diff --git a/js/carousel.js b/js/carousel.js
index 4e4e47797..82106d278 100644
--- a/js/carousel.js
+++ b/js/carousel.js
@@ -42,6 +42,7 @@
   }
 
   Carousel.prototype.keydown = function (e) {
+    if (/input|textarea/i.test(e.target.tagName)) return
     switch (e.which) {
       case 37: this.prev(); break
       case 39: this.next(); break
-- 
cgit v1.2.3