Skip to content

B
bootstrap
Commit ebc1fe90 authored by Jacob Thornton's avatar Jacob Thornton
Browse files
Options

only trigger $.support.transition.end when it exists

parent 3a751a63
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
docs/assets/js/bootstrap-carousel.js
View file @ ebc1fe90
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
, pause: function (e) { , pause: function (e) {
if (!e) this.paused = true if (!e) this.paused = true
if (this.$element.find('.next, .prev')) { if (this.$element.find('.next, .prev') && $.support.transition.end) {
this.$element.trigger($.support.transition.end) this.$element.trigger($.support.transition.end)
this.cycle() this.cycle()
} }
......
docs/assets/js/bootstrap.js
View file @ ebc1fe90
...@@ -312,7 +312,7 @@ ...@@ -312,7 +312,7 @@
, pause: function (e) { , pause: function (e) {
if (!e) this.paused = true if (!e) this.paused = true
if (this.$element.find('.next, .prev')) { if (this.$element.find('.next, .prev') && $.support.transition.end) {
this.$element.trigger($.support.transition.end) this.$element.trigger($.support.transition.end)
this.cycle() this.cycle()
} }
......
docs/assets/js/bootstrap.min.js
View file @ ebc1fe90
This diff is collapsed.
js/bootstrap-carousel.js
View file @ ebc1fe90
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
, pause: function (e) { , pause: function (e) {
if (!e) this.paused = true if (!e) this.paused = true
if (this.$element.find('.next, .prev')) { if (this.$element.find('.next, .prev') && $.support.transition.end) {
this.$element.trigger($.support.transition.end) this.$element.trigger($.support.transition.end)
this.cycle() this.cycle()
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment