Run grunt.

[ci skip]
twbs · Oct 13, 2015 · 724bf86 · 724bf86
1 parent fe0ad82
commit 724bf86
Show file tree

Hide file tree

Showing 25 changed files with 149 additions and 59 deletions.
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
diff --git a/dist/css/bootstrap.css.map b/dist/css/bootstrap.css.map
diff --git a/dist/css/bootstrap.min.css b/dist/css/bootstrap.min.css
diff --git a/dist/css/bootstrap.min.css.map b/dist/css/bootstrap.min.css.map
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js
@@ -650,6 +650,14 @@ var Carousel = (function ($) {
           this._slide(Direction.NEXT);
         }
       }
+    }, {
+      key: 'nextWhenVisible',
+      value: function nextWhenVisible() {
+        // Don't call next when the page isn't visible
+        if (!document.hidden) {
+          this.next();
+        }
+      }
     }, {
       key: 'prev',
       value: function prev() {
@@ -685,7 +693,7 @@ var Carousel = (function ($) {
         }
 
         if (this._config.interval && !this._isPaused) {
-          this._interval = setInterval($.proxy(this.next, this), this._config.interval);
+          this._interval = setInterval($.proxy(document.visibilityState ? this.nextWhenVisible : this.next, this), this._config.interval);
         }
       }
     }, {

diff --git a/dist/js/bootstrap.min.js b/dist/js/bootstrap.min.js
diff --git a/dist/js/umd/carousel.js b/dist/js/umd/carousel.js
@@ -136,6 +136,14 @@
             this._slide(Direction.NEXT);
           }
         }
+      }, {
+        key: 'nextWhenVisible',
+        value: function nextWhenVisible() {
+          // Don't call next when the page isn't visible
+          if (!document.hidden) {
+            this.next();
+          }
+        }
       }, {
         key: 'prev',
         value: function prev() {
@@ -171,7 +179,7 @@
           }
 
           if (this._config.interval && !this._isPaused) {
-            this._interval = setInterval($.proxy(this.next, this), this._config.interval);
+            this._interval = setInterval($.proxy(document.visibilityState ? this.nextWhenVisible : this.next, this), this._config.interval);
           }
         }
       }, {

diff --git a/docs/assets/css/docs.min.css b/docs/assets/css/docs.min.css
diff --git a/docs/assets/css/docs.min.css.map b/docs/assets/css/docs.min.css.map
diff --git a/docs/dist/css/bootstrap.css b/docs/dist/css/bootstrap.css
diff --git a/docs/dist/css/bootstrap.css.map b/docs/dist/css/bootstrap.css.map
diff --git a/docs/dist/css/bootstrap.min.css b/docs/dist/css/bootstrap.min.css
diff --git a/docs/dist/css/bootstrap.min.css.map b/docs/dist/css/bootstrap.min.css.map