Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap-rubygem.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGleb Mazovetskiy <glex.spb@gmail.com>2017-09-03 18:50:19 +0300
committerGleb Mazovetskiy <glex.spb@gmail.com>2017-09-03 18:50:19 +0300
commitb12fdcd48c26cee905c3365626247f452fb941f2 (patch)
tree96dd5cefb67fc380b71ae589672fa415b4903d81 /assets/javascripts/bootstrap/carousel.js
parentfb2f045b8ed4a17ec5cacffd19bb5bea7e7fe9fd (diff)
rake update[v4-dev]
Diffstat (limited to 'assets/javascripts/bootstrap/carousel.js')
-rw-r--r--assets/javascripts/bootstrap/carousel.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/assets/javascripts/bootstrap/carousel.js b/assets/javascripts/bootstrap/carousel.js
index 1be1f5d..c657834 100644
--- a/assets/javascripts/bootstrap/carousel.js
+++ b/assets/javascripts/bootstrap/carousel.js
@@ -123,7 +123,8 @@ var Carousel = function ($) {
Carousel.prototype.nextWhenVisible = function nextWhenVisible() {
// Don't call next when the page isn't visible
- if (!document.hidden) {
+ // or the carousel or its parent isn't visible
+ if (!document.hidden && $(this._element).is(':visible') && $(this._element).css('visibility') !== 'hidden') {
this.next();
}
};