Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip

3f493f0d · Mark Otto · f706acb1 · 5abe33f5 · 3f493f0d · 3f493f0d
Commit 3f493f0d authored 12 years ago by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing

with 2 additions and 2 deletions
+2 -2
--- 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()
    })
  }


--- 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('-'))