diff options
| author | XhmikosR <[email protected]> | 2014-03-17 09:12:55 +0200 |
|---|---|---|
| committer | XhmikosR <[email protected]> | 2014-06-06 01:23:07 +0300 |
| commit | 7b0acf14d8a7c7c6089035a848cba540ed963f36 (patch) | |
| tree | d0b76d93abbce4390a52f4c367a0b0b8db08651c /js/carousel.js | |
| parent | 5ef9383f5388ba7a701c4377b43ebdbedb0bf748 (diff) | |
| download | bootstrap-7b0acf14d8a7c7c6089035a848cba540ed963f36.tar.xz bootstrap-7b0acf14d8a7c7c6089035a848cba540ed963f36.zip | |
Comply to the new style.
Diffstat (limited to 'js/carousel.js')
| -rw-r--r-- | js/carousel.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/js/carousel.js b/js/carousel.js index 2a94a9838..56aa8eb91 100644 --- a/js/carousel.js +++ b/js/carousel.js @@ -103,7 +103,7 @@ $next = this.$element.find('.item')[fallback]() } - if ($next.hasClass('active')) return this.sliding = false + if ($next.hasClass('active')) return (this.sliding = false) var relatedTarget = $next[0] var slideEvent = $.Event('slide.bs.carousel', { relatedTarget: relatedTarget, direction: direction }) @@ -185,7 +185,8 @@ // ================= $(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) { - var $this = $(this), href + var href + var $this = $(this) 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 = $this.attr('data-slide-to') |