diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index 6a1b21f3702665166c6bd99e635eebc42a84ac47..4838a16847fdc1fa908109a192660edf7b5b497d 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -164,7 +164,7 @@ if (!data) $this.data('carousel', (data = new Carousel(this, options))) if (typeof option == 'number') data.to(option) else if (action) data[action]() - else if (options.interval) data.cycle() + else if (options.interval) data.pause().cycle() }) } diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 9e721121888beb191161ecd8b789592e25779040..6755aa7e2014fa198ce3944f0044d6e9a46cd0b2 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -52,7 +52,7 @@ , actives , hasData - if (this.transitioning) return + if (this.transitioning || this.$element.hasClass('in')) return dimension = this.dimension() scroll = $.camelCase(['scroll', dimension].join('-'))