diff options
| author | Mark Otto <[email protected]> | 2012-02-21 08:25:19 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-21 08:25:19 -0800 |
| commit | 80abc50d3efd2123f23bb908e9a23e45548abcea (patch) | |
| tree | 3ecc372b92214c85eb726fe4f746a15444c7938a /docs/assets | |
| parent | f3ad4c7183251713eb021a400211cc9b07577080 (diff) | |
| parent | d149a131c14bb8be32ecc306f2128dddec9e83bf (diff) | |
| download | bootstrap-80abc50d3efd2123f23bb908e9a23e45548abcea.tar.xz bootstrap-80abc50d3efd2123f23bb908e9a23e45548abcea.zip | |
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs/assets')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 53789 -> 53792 bytes | |||
| -rw-r--r-- | docs/assets/js/bootstrap-carousel.js | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex e51e75306..ed054dd31 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/js/bootstrap-carousel.js b/docs/assets/js/bootstrap-carousel.js index 810256e80..aef98fb05 100644 --- a/docs/assets/js/bootstrap-carousel.js +++ b/docs/assets/js/bootstrap-carousel.js @@ -83,14 +83,14 @@ , fallback = type == 'next' ? 'first' : 'last' , that = this - if (!$next.length) return - this.sliding = true isCycling && this.pause() $next = $next.length ? $next : this.$element.find('.item')[fallback]() + if ($next.hasClass('active')) return + if (!$.support.transition && this.$element.hasClass('slide')) { this.$element.trigger('slide') $active.removeClass('active') |