From: fat <jacobthornton@gmail.com>
Date: Tue, 24 Jun 2014 06:08:23 +0000 (-0700)
Subject: Merge branch 'master' into fix-13386
X-Git-Tag: v3.2.0~7^2~12^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0aa01f63e33e0fb4c0c770dba7d2a631b9b562d3;p=thirdparty%2Fbootstrap.git

Merge branch 'master' into fix-13386

Conflicts:
	js/carousel.js
---

0aa01f63e33e0fb4c0c770dba7d2a631b9b562d3
diff --cc js/carousel.js
index d3e7e52b4e,d7727bcce6..eee2d0f848
--- a/js/carousel.js
+++ b/js/carousel.js
@@@ -7,223 -7,216 +7,217 @@@
   * ======================================================================== */
  
  
- +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
-     // =========================
- 
-     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))
+ +function ($) {
+   'use strict';
+ 
+   // 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
+ 
+     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.1.1'
+ 
+   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.VERSION  = '3.1.1'
+     e.preventDefault()
+   }
  
-     Carousel.DEFAULTS = {
-       interval: 5000,
-       pause: 'hover',
-       wrap: true
-     }
+   Carousel.prototype.cycle = function (e) {
+     e || (this.paused = false)
  
-     Carousel.prototype.keydown = function (e) {
-       switch (e.which) {
-         case 37: this.prev(); break
-         case 39: this.next(); break
-         default: return
-       }
+     this.interval && clearInterval(this.interval)
  
-       e.preventDefault()
-     }
+     this.options.interval
+       && !this.paused
+       && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
  
-     Carousel.prototype.cycle = function (e) {
-       e || (this.paused = false)
+     return this
+   }
  
-       this.interval && clearInterval(this.interval)
+   Carousel.prototype.getItemIndex = function (item) {
+     this.$items = item.parent().children('.item')
+     return this.$items.index(item || this.$active)
+   }
  
-       this.options.interval
-         && !this.paused
-         && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
+   Carousel.prototype.to = function (pos) {
+     var that        = this
+     var activeIndex = this.getItemIndex(this.$active = this.$element.find('.item.active'))
  
-       return this
-     }
+     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()
+ 
+     return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
+   }
  
-     Carousel.prototype.getItemIndex = function (item) {
-       this.$items = item.parent().children('.item')
-       return this.$items.index(item || this.$active)
+   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.to = function (pos) {
-       var that        = this
-       var activeIndex = this.getItemIndex(this.$active = this.$element.find('.item.active'))
+     this.interval = clearInterval(this.interval)
+ 
+     return this
+   }
+ 
+   Carousel.prototype.next = function () {
+     if (this.sliding) return
+     return this.slide('next')
+   }
  
-       if (pos > (this.$items.length - 1) || pos < 0) return
+   Carousel.prototype.prev = function () {
+     if (this.sliding) return
+     return this.slide('prev')
+   }
  
-       if (this.sliding)       return this.$element.one('slid.bs.carousel', function () { that.to(pos) }) // yes, "slid"
-       if (activeIndex == pos) return this.pause().cycle()
+   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
  
-       return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
+     if (!$next.length) {
+       if (!this.options.wrap) return
+       $next = this.$element.find('.item')[fallback]()
      }
  
-     Carousel.prototype.pause = function (e) {
-       e || (this.paused = true)
+     if ($next.hasClass('active')) return (this.sliding = false)
  
-       if (this.$element.find('.next, .prev').length && $.support.transition) {
-         this.$element.trigger($.support.transition.end)
-         this.cycle(true)
-       }
+     var relatedTarget = $next[0]
+     var slideEvent = $.Event('slide.bs.carousel', {
+       relatedTarget: relatedTarget,
+       direction: direction
+     })
+     this.$element.trigger(slideEvent)
+     if (slideEvent.isDefaultPrevented()) return
  
-       this.interval = clearInterval(this.interval)
+     this.sliding = true
  
-       return this
-     }
+     isCycling && this.pause()
  
-     Carousel.prototype.next = function () {
-       if (this.sliding) return
-       return this.slide('next')
+     if (this.$indicators.length) {
+       this.$indicators.find('.active').removeClass('active')
+       var $nextIndicator = $(this.$indicators.children()[this.getItemIndex($next)])
+       $nextIndicator && $nextIndicator.addClass('active')
      }
  
-     Carousel.prototype.prev = function () {
-       if (this.sliding) return
-       return this.slide('prev')
+     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)
      }
  
-     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
-     }
+     isCycling && this.cycle()
  
+     return this
+   }
  
-     // CAROUSEL PLUGIN DEFINITION
-     // ==========================
  
-     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
+   // CAROUSEL PLUGIN DEFINITION
+   // ==========================
  
-         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()
-       })
-     }
+   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()
+     })
+   }
  
-     var old = $.fn.carousel
+   var old = $.fn.carousel
  
-     $.fn.carousel             = Plugin
-     $.fn.carousel.Constructor = Carousel
+   $.fn.carousel             = Plugin
+   $.fn.carousel.Constructor = Carousel
  
  
-     // CAROUSEL NO CONFLICT
-     // ====================
+   // CAROUSEL NO CONFLICT
+   // ====================
  
-     $.fn.carousel.noConflict = function () {
-       $.fn.carousel = old
-       return this
-     }
+   $.fn.carousel.noConflict = function () {
+     $.fn.carousel = old
+     return this
+   }
  
  
-     // CAROUSEL DATA-API
-     // =================
+   // 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
-       if (!$target.hasClass('carousel')) return
-       var options = $.extend({}, $target.data(), $this.data())
-       var slideIndex = $this.attr('data-slide-to')
-       if (slideIndex) options.interval = false
+   $(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
  
-       Plugin.call($target, options)
+     Plugin.call($target, options)
  
-       if (slideIndex) {
-         $target.data('bs.carousel').to(slideIndex)
-       }
+     if (slideIndex) {
+       $target.data('bs.carousel').to(slideIndex)
+     }
  
-       e.preventDefault()
-     })
+     e.preventDefault()
+   })
  
-     $(window).on('load', function () {
-       $('[data-ride="carousel"]').each(function () {
-         var $carousel = $(this)
-         Plugin.call($carousel, $carousel.data())
-       })
+   $(window).on('load', function () {
+     $('[data-ride="carousel"]').each(function () {
+       var $carousel = $(this)
+       Plugin.call($carousel, $carousel.data())
      })
- 
    })
  
- }();
+ }(jQuery);