diff options
| author | Jacob Thornton <[email protected]> | 2012-03-19 21:39:39 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-03-19 21:39:39 -0700 |
| commit | 63bd7cb478500463ac7339667d89792f7108f3c0 (patch) | |
| tree | 58f08f79c1fa244ae0ec671eb0c994c4084581a7 /docs | |
| parent | bce33bbb091e66a58418395188ea50be151f3f8e (diff) | |
| download | bootstrap-63bd7cb478500463ac7339667d89792f7108f3c0.tar.xz bootstrap-63bd7cb478500463ac7339667d89792f7108f3c0.zip | |
fix slide logic for ie+ in carousel
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 55867 -> 55871 bytes | |||
| -rw-r--r-- | docs/assets/js/bootstrap-carousel.js | 14 |
2 files changed, 7 insertions, 7 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 8564e3d96..84b91830f 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 287519900..7db5bea33 100644 --- a/docs/assets/js/bootstrap-carousel.js +++ b/docs/assets/js/bootstrap-carousel.js @@ -95,13 +95,7 @@ if ($next.hasClass('active')) return - if (!$.support.transition && this.$element.hasClass('slide')) { - this.$element.trigger('slide') - $active.removeClass('active') - $next.addClass('active') - this.sliding = false - this.$element.trigger('slid') - } else { + if ($.support.transition && this.$element.hasClass('slide')) { $next.addClass(type) $next[0].offsetWidth // force reflow $active.addClass(direction) @@ -113,6 +107,12 @@ that.sliding = false setTimeout(function () { that.$element.trigger('slid') }, 0) }) + } else { + this.$element.trigger('slide') + $active.removeClass('active') + $next.addClass('active') + this.sliding = false + this.$element.trigger('slid') } isCycling && this.cycle() |