Merge remote-tracking branch 'upstream/master' into node-requirable

Conflicts:
	Gruntfile.js

1 files changed, 176 insertions, 172 deletions

diff --git a/js/carousel.js b/js/carousel.js
index 05631f7a3..65cc7b912 100644
--- a/js/carousel.js
+++ b/js/carousel.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: carousel.js v3.1.1
+ * Bootstrap: carousel.js v3.2.0
  * http://getbootstrap.com/javascript/#carousel
  * ========================================================================
  * Copyright 2011-2014 Twitter, Inc.
@@ -7,222 +7,226 @@
  * ======================================================================== */
 
 
-+function () { 'use strict';
++function ($) {
+  'use strict';
 
-  (function (o_o) {
-    typeof define  == 'function' && define.amd ? define(['jquery'], o_o) :
-    typeof exports == 'object' ? o_o(require('jquery')) : o_o(jQuery)
-  })(function ($) {
+  // CAROUSEL CLASS DEFINITION
+  // =========================
 
-    // CAROUSEL CLASS DEFINITION
-    // =========================
+  var Carousel = function (element, options) {
+    this.$element    = $(element).on('keydown.bs.carousel', $.proxy(this.keydown, this))
+    this.$indicators = this.$element.find('.carousel-indicators')
+    this.options     = options
+    this.paused      =
+    this.sliding     =
+    this.interval    =
+    this.$active     =
+    this.$items      = null
 
-    var Carousel = function (element, options) {
-      this.$element    = $(element).on('keydown.bs.carousel', $.proxy(this.keydown, this))
-      this.$indicators = this.$element.find('.carousel-indicators')
-      this.options     = options
-      this.paused      =
-      this.sliding     =
-      this.interval    =
-      this.$active     =
-      this.$items      = null
+    this.options.pause == 'hover' && this.$element
+      .on('mouseenter.bs.carousel', $.proxy(this.pause, this))
+      .on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
+  }
 
-      this.options.pause == 'hover' && this.$element
-        .on('mouseenter.bs.carousel', $.proxy(this.pause, this))
-        .on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
-    }
+  Carousel.VERSION  = '3.2.0'
+
+  Carousel.TRANSITION_DURATION = 600
 
-    Carousel.VERSION  = '3.1.1'
+  Carousel.DEFAULTS = {
+    interval: 5000,
+    pause: 'hover',
+    wrap: true
+  }
 
-    Carousel.DEFAULTS = {
-      interval: 5000,
-      pause: 'hover',
-      wrap: true
+  Carousel.prototype.keydown = function (e) {
+    switch (e.which) {
+      case 37: this.prev(); break
+      case 39: this.next(); break
+      default: return
     }
 
-    Carousel.prototype.keydown = function (e) {
-      switch (e.which) {
-        case 37: this.prev(); break
-        case 39: this.next(); break
-        default: return
-      }
+    e.preventDefault()
+  }
 
-      e.preventDefault()
-    }
+  Carousel.prototype.cycle = function (e) {
+    e || (this.paused = false)
 
-    Carousel.prototype.cycle = function (e) {
-      e || (this.paused = false)
+    this.interval && clearInterval(this.interval)
 
-      this.interval && clearInterval(this.interval)
+    this.options.interval
+      && !this.paused
+      && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
 
-      this.options.interval
-        && !this.paused
-        && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
+    return this
+  }
 
-      return this
-    }
+  Carousel.prototype.getItemIndex = function (item) {
+    this.$items = item.parent().children('.item')
+    return this.$items.index(item || this.$active)
+  }
 
-    Carousel.prototype.getItemIndex = function (item) {
-      this.$items = item.parent().children('.item')
-      return this.$items.index(item || this.$active)
-    }
+  Carousel.prototype.getItemForDirection = function (direction, active) {
+    var delta = direction == 'prev' ? -1 : 1
+    var activeIndex = this.getItemIndex(active)
+    var itemIndex = (activeIndex + delta) % this.$items.length
+    return this.$items.eq(itemIndex)
+  }
+
+  Carousel.prototype.to = function (pos) {
+    var that        = this
+    var activeIndex = this.getItemIndex(this.$active = this.$element.find('.item.active'))
 
-    Carousel.prototype.to = function (pos) {
-      var that        = this
-      var activeIndex = this.getItemIndex(this.$active = this.$element.find('.item.active'))
+    if (pos > (this.$items.length - 1) || pos < 0) return
 
-      if (pos > (this.$items.length - 1) || pos < 0) return
+    if (this.sliding)       return this.$element.one('slid.bs.carousel', function () { that.to(pos) }) // yes, "slid"
+    if (activeIndex == pos) return this.pause().cycle()
 
-      if (this.sliding)       return this.$element.one('slid.bs.carousel', function () { that.to(pos) }) // yes, "slid"
-      if (activeIndex == pos) return this.pause().cycle()
+    return this.slide(pos > activeIndex ? 'next' : 'prev', this.$items.eq(pos))
+  }
 
-      return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
+  Carousel.prototype.pause = function (e) {
+    e || (this.paused = true)
+
+    if (this.$element.find('.next, .prev').length && $.support.transition) {
+      this.$element.trigger($.support.transition.end)
+      this.cycle(true)
     }
 
-    Carousel.prototype.pause = function (e) {
-      e || (this.paused = true)
+    this.interval = clearInterval(this.interval)
 
-      if (this.$element.find('.next, .prev').length && $.support.transition) {
-        this.$element.trigger($.support.transition.end)
-        this.cycle(true)
-      }
+    return this
+  }
 
-      this.interval = clearInterval(this.interval)
+  Carousel.prototype.next = function () {
+    if (this.sliding) return
+    return this.slide('next')
+  }
 
-      return this
-    }
+  Carousel.prototype.prev = function () {
+    if (this.sliding) return
+    return this.slide('prev')
+  }
+
+  Carousel.prototype.slide = function (type, next) {
+    var $active   = this.$element.find('.item.active')
+    var $next     = next || this.getItemForDirection(type, $active)
+    var isCycling = this.interval
+    var direction = type == 'next' ? 'left' : 'right'
+    var fallback  = type == 'next' ? 'first' : 'last'
+    var that      = this
 
-    Carousel.prototype.next = function () {
-      if (this.sliding) return
-      return this.slide('next')
+    if (!$next.length) {
+      if (!this.options.wrap) return
+      $next = this.$element.find('.item')[fallback]()
     }
 
-    Carousel.prototype.prev = function () {
-      if (this.sliding) return
-      return this.slide('prev')
+    if ($next.hasClass('active')) return (this.sliding = false)
+
+    var relatedTarget = $next[0]
+    var slideEvent = $.Event('slide.bs.carousel', {
+      relatedTarget: relatedTarget,
+      direction: direction
+    })
+    this.$element.trigger(slideEvent)
+    if (slideEvent.isDefaultPrevented()) return
+
+    this.sliding = true
+
+    isCycling && this.pause()
+
+    if (this.$indicators.length) {
+      this.$indicators.find('.active').removeClass('active')
+      var $nextIndicator = $(this.$indicators.children()[this.getItemIndex($next)])
+      $nextIndicator && $nextIndicator.addClass('active')
     }
 
-    Carousel.prototype.slide = function (type, next) {
-      var $active   = this.$element.find('.item.active')
-      var $next     = next || $active[type]()
-      var isCycling = this.interval
-      var direction = type == 'next' ? 'left' : 'right'
-      var fallback  = type == 'next' ? 'first' : 'last'
-      var that      = this
-
-      if (!$next.length) {
-        if (!this.options.wrap) return
-        $next = this.$element.find('.item')[fallback]()
-      }
-
-      if ($next.hasClass('active')) return (this.sliding = false)
-
-      var relatedTarget = $next[0]
-      var slideEvent = $.Event('slide.bs.carousel', {
-        relatedTarget: relatedTarget,
-        direction: direction
-      })
-      this.$element.trigger(slideEvent)
-      if (slideEvent.isDefaultPrevented()) return
-
-      this.sliding = true
-
-      isCycling && this.pause()
-
-      if (this.$indicators.length) {
-        this.$indicators.find('.active').removeClass('active')
-        var $nextIndicator = $(this.$indicators.children()[this.getItemIndex($next)])
-        $nextIndicator && $nextIndicator.addClass('active')
-      }
-
-      var slidEvent = $.Event('slid.bs.carousel', { relatedTarget: relatedTarget, direction: direction }) // yes, "slid"
-      if ($.support.transition && this.$element.hasClass('slide')) {
-        $next.addClass(type)
-        $next[0].offsetWidth // force reflow
-        $active.addClass(direction)
-        $next.addClass(direction)
-        $active
-          .one('bsTransitionEnd', function () {
-            $next.removeClass([type, direction].join(' ')).addClass('active')
-            $active.removeClass(['active', direction].join(' '))
-            that.sliding = false
-            setTimeout(function () {
-              that.$element.trigger(slidEvent)
-            }, 0)
-          })
-          .emulateTransitionEnd($active.css('transition-duration').slice(0, -1) * 1000)
-      } else {
-        $active.removeClass('active')
-        $next.addClass('active')
-        this.sliding = false
-        this.$element.trigger(slidEvent)
-      }
-
-      isCycling && this.cycle()
-
-      return this
+    var slidEvent = $.Event('slid.bs.carousel', { relatedTarget: relatedTarget, direction: direction }) // yes, "slid"
+    if ($.support.transition && this.$element.hasClass('slide')) {
+      $next.addClass(type)
+      $next[0].offsetWidth // force reflow
+      $active.addClass(direction)
+      $next.addClass(direction)
+      $active
+        .one('bsTransitionEnd', function () {
+          $next.removeClass([type, direction].join(' ')).addClass('active')
+          $active.removeClass(['active', direction].join(' '))
+          that.sliding = false
+          setTimeout(function () {
+            that.$element.trigger(slidEvent)
+          }, 0)
+        })
+        .emulateTransitionEnd(Carousel.TRANSITION_DURATION)
+    } else {
+      $active.removeClass('active')
+      $next.addClass('active')
+      this.sliding = false
+      this.$element.trigger(slidEvent)
     }
 
+    isCycling && this.cycle()
 
-    // CAROUSEL PLUGIN DEFINITION
-    // ==========================
+    return this
+  }
 
-    function Plugin(option) {
-      return this.each(function () {
-        var $this   = $(this)
-        var data    = $this.data('bs.carousel')
-        var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option)
-        var action  = typeof option == 'string' ? option : options.slide
 
-        if (!data) $this.data('bs.carousel', (data = new Carousel(this, options)))
-        if (typeof option == 'number') data.to(option)
-        else if (action) data[action]()
-        else if (options.interval) data.pause().cycle()
-      })
-    }
+  // CAROUSEL PLUGIN DEFINITION
+  // ==========================
 
-    var old = $.fn.carousel
+  function Plugin(option) {
+    return this.each(function () {
+      var $this   = $(this)
+      var data    = $this.data('bs.carousel')
+      var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option)
+      var action  = typeof option == 'string' ? option : options.slide
+
+      if (!data) $this.data('bs.carousel', (data = new Carousel(this, options)))
+      if (typeof option == 'number') data.to(option)
+      else if (action) data[action]()
+      else if (options.interval) data.pause().cycle()
+    })
+  }
 
-    $.fn.carousel             = Plugin
-    $.fn.carousel.Constructor = Carousel
+  var old = $.fn.carousel
 
+  $.fn.carousel             = Plugin
+  $.fn.carousel.Constructor = Carousel
 
-    // CAROUSEL NO CONFLICT
-    // ====================
 
-    $.fn.carousel.noConflict = function () {
-      $.fn.carousel = old
-      return this
-    }
+  // CAROUSEL NO CONFLICT
+  // ====================
 
+  $.fn.carousel.noConflict = function () {
+    $.fn.carousel = old
+    return this
+  }
 
-    // CAROUSEL DATA-API
-    // =================
 
-    $(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
-      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')
-      if (slideIndex) options.interval = false
+  // CAROUSEL DATA-API
+  // =================
 
-      Plugin.call($target, options)
+  $(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
+    var href
+    var $this   = $(this)
+    var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7
+    if (!$target.hasClass('carousel')) return
+    var options = $.extend({}, $target.data(), $this.data())
+    var slideIndex = $this.attr('data-slide-to')
+    if (slideIndex) options.interval = false
 
-      if (slideIndex) {
-        $target.data('bs.carousel').to(slideIndex)
-      }
+    Plugin.call($target, options)
 
-      e.preventDefault()
-    })
+    if (slideIndex) {
+      $target.data('bs.carousel').to(slideIndex)
+    }
 
-    $(window).on('load', function () {
-      $('[data-ride="carousel"]').each(function () {
-        var $carousel = $(this)
-        Plugin.call($carousel, $carousel.data())
-      })
-    })
+    e.preventDefault()
+  })
 
+  $(window).on('load', function () {
+    $('[data-ride="carousel"]').each(function () {
+      var $carousel = $(this)
+      Plugin.call($carousel, $carousel.data())
+    })
   })
 
-}();
+}(jQuery);