diff options
Diffstat (limited to 'docs/assets/js/bootstrap.js')
| -rw-r--r-- | docs/assets/js/bootstrap.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js index fc2da6709..d5ce3c619 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -437,12 +437,13 @@ var $this = $(this), href var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 var options = $.extend({}, $target.data(), $this.data()) - var slideIndex + var slideIndex = $this.attr('data-slide-to') + if (slideIndex) options.interval = false $target.carousel(options) if (slideIndex = $this.attr('data-slide-to')) { - $target.data('bs.carousel').pause().to(slideIndex).cycle() + $target.data('bs.carousel').to(slideIndex) } e.preventDefault() @@ -612,8 +613,7 @@ var parent = $this.attr('data-parent') var $parent = parent && $(parent) - console.log(data, data && data.transitioning) - if (data && !data.transitioning) { + if (!data || !data.transitioning) { if ($parent) $parent.find('[data-toggle=collapse][data-parent=' + parent + ']').not($this).addClass('collapsed') $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed') } |