fix carousel when hiding a reshowing - make sure it always triggers t…

…ransition end #3248
twbs · Jun 3, 2012 · 555a3b0 · jkresner · Jun 3, 2012 · fat
1 parent 0b82796
commit 555a3b0
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/docs/assets/js/bootstrap-carousel.js b/docs/assets/js/bootstrap-carousel.js
@@ -68,6 +68,10 @@
 
   , pause: function (e) {
       if (!e) this.paused = true
+      if (this.$element.find('.next, .prev')) {
+        this.$element.trigger($.support.transition.end)
+        this.cycle()
+      }
       clearInterval(this.interval)
       this.interval = null
       return this

diff --git a/docs/assets/js/bootstrap-typeahead.js b/docs/assets/js/bootstrap-typeahead.js
@@ -178,6 +178,8 @@
     }
 
   , move: function (e) {
+      if (!this.shown) return
+
       switch(e.keyCode) {
         case 9: // tab
         case 13: // enter
@@ -205,7 +207,7 @@
     }
 
   , keypress: function (e) {
-      if (!this.shown || this.suppressKeyPressRepeat) return
+      if (this.suppressKeyPressRepeat) return
       this.move(e)
     }
 

diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js
@@ -312,6 +312,10 @@
 
   , pause: function (e) {
       if (!e) this.paused = true
+      if (this.$element.find('.next, .prev')) {
+        this.$element.trigger($.support.transition.end)
+        this.cycle()
+      }
       clearInterval(this.interval)
       this.interval = null
       return this
@@ -1772,6 +1776,8 @@
     }
 
   , move: function (e) {
+      if (!this.shown) return
+
       switch(e.keyCode) {
         case 9: // tab
         case 13: // enter
@@ -1799,7 +1805,7 @@
     }
 
   , keypress: function (e) {
-      if (!this.shown || this.suppressKeyPressRepeat) return
+      if (this.suppressKeyPressRepeat) return
       this.move(e)
     }