|
@@ -1,5 +1,5 @@
|
|
|
/*!
|
|
|
- * Bootstrap v3.3.2 (http://getbootstrap.com)
|
|
|
+ * Bootstrap v3.3.4 (http://getbootstrap.com)
|
|
|
* Copyright 2011-2015 Twitter, Inc.
|
|
|
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
|
|
*/
|
|
@@ -17,7 +17,7 @@ if (typeof jQuery === 'undefined') {
|
|
|
}(jQuery);
|
|
|
|
|
|
/* ========================================================================
|
|
|
- * Bootstrap: transition.js v3.3.2
|
|
|
+ * Bootstrap: transition.js v3.3.4
|
|
|
* http://getbootstrap.com/javascript/#transitions
|
|
|
* ========================================================================
|
|
|
* Copyright 2011-2015 Twitter, Inc.
|
|
@@ -77,7 +77,7 @@ if (typeof jQuery === 'undefined') {
|
|
|
}(jQuery);
|
|
|
|
|
|
/* ========================================================================
|
|
|
- * Bootstrap: alert.js v3.3.2
|
|
|
+ * Bootstrap: alert.js v3.3.4
|
|
|
* http://getbootstrap.com/javascript/#alerts
|
|
|
* ========================================================================
|
|
|
* Copyright 2011-2015 Twitter, Inc.
|
|
@@ -96,7 +96,7 @@ if (typeof jQuery === 'undefined') {
|
|
|
$(el).on('click', dismiss, this.close)
|
|
|
}
|
|
|
|
|
|
- Alert.VERSION = '3.3.2'
|
|
|
+ Alert.VERSION = '3.3.4'
|
|
|
|
|
|
Alert.TRANSITION_DURATION = 150
|
|
|
|
|
@@ -172,7 +172,7 @@ if (typeof jQuery === 'undefined') {
|
|
|
}(jQuery);
|
|
|
|
|
|
/* ========================================================================
|
|
|
- * Bootstrap: button.js v3.3.2
|
|
|
+ * Bootstrap: button.js v3.3.4
|
|
|
* http://getbootstrap.com/javascript/#buttons
|
|
|
* ========================================================================
|
|
|
* Copyright 2011-2015 Twitter, Inc.
|
|
@@ -192,7 +192,7 @@ if (typeof jQuery === 'undefined') {
|
|
|
this.isLoading = false
|
|
|
}
|
|
|
|
|
|
- Button.VERSION = '3.3.2'
|
|
|
+ Button.VERSION = '3.3.4'
|
|
|
|
|
|
Button.DEFAULTS = {
|
|
|
loadingText: 'loading...'
|
|
@@ -289,7 +289,7 @@ if (typeof jQuery === 'undefined') {
|
|
|
}(jQuery);
|
|
|
|
|
|
/* ========================================================================
|
|
|
- * Bootstrap: carousel.js v3.3.2
|
|
|
+ * Bootstrap: carousel.js v3.3.4
|
|
|
* http://getbootstrap.com/javascript/#carousel
|
|
|
* ========================================================================
|
|
|
* Copyright 2011-2015 Twitter, Inc.
|
|
@@ -307,10 +307,10 @@ if (typeof jQuery === 'undefined') {
|
|
|
this.$element = $(element)
|
|
|
this.$indicators = this.$element.find('.carousel-indicators')
|
|
|
this.options = options
|
|
|
- this.paused =
|
|
|
- this.sliding =
|
|
|
- this.interval =
|
|
|
- this.$active =
|
|
|
+ this.paused = null
|
|
|
+ this.sliding = null
|
|
|
+ this.interval = null
|
|
|
+ this.$active = null
|
|
|
this.$items = null
|
|
|
|
|
|
this.options.keyboard && this.$element.on('keydown.bs.carousel', $.proxy(this.keydown, this))
|
|
@@ -320,7 +320,7 @@ if (typeof jQuery === 'undefined') {
|
|
|
.on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
|
|
|
}
|
|
|
|
|
|
- Carousel.VERSION = '3.3.2'
|
|
|
+ Carousel.VERSION = '3.3.4'
|
|
|
|
|
|
Carousel.TRANSITION_DURATION = 600
|
|
|
|
|
@@ -527,7 +527,7 @@ if (typeof jQuery === 'undefined') {
|
|
|
}(jQuery);
|
|
|
|
|
|
/* ========================================================================
|
|
|
- * Bootstrap: collapse.js v3.3.2
|
|
|
+ * Bootstrap: collapse.js v3.3.4
|
|
|
* http://getbootstrap.com/javascript/#collapse
|
|
|
* ========================================================================
|
|
|
* Copyright 2011-2015 Twitter, Inc.
|
|
@@ -544,7 +544,8 @@ if (typeof jQuery === 'undefined') {
|
|
|
var Collapse = function (element, options) {
|
|
|
this.$element = $(element)
|
|
|
this.options = $.extend({}, Collapse.DEFAULTS, options)
|
|
|
- this.$trigger = $(this.options.trigger).filter('[href="#' + element.id + '"], [data-target="#' + element.id + '"]')
|
|
|
+ this.$trigger = $('[data-toggle="collapse"][href="#' + element.id + '"],' +
|
|
|
+ '[data-toggle="collapse"][data-target="#' + element.id + '"]')
|
|
|
this.transitioning = null
|
|
|
|
|
|
if (this.options.parent) {
|
|
@@ -556,13 +557,12 @@ if (typeof jQuery === 'undefined') {
|
|
|
if (this.options.toggle) this.toggle()
|
|
|
}
|
|
|
|
|
|
- Collapse.VERSION = '3.3.2'
|
|
|
+ Collapse.VERSION = '3.3.4'
|
|
|
|
|
|
Collapse.TRANSITION_DURATION = 350
|
|
|
|
|
|
Collapse.DEFAULTS = {
|
|
|
- toggle: true,
|
|
|
- trigger: '[data-toggle="collapse"]'
|
|
|
+ toggle: true
|
|
|
}
|
|
|
|
|
|
Collapse.prototype.dimension = function () {
|
|
@@ -700,7 +700,7 @@ if (typeof jQuery === 'undefined') {
|
|
|
var data = $this.data('bs.collapse')
|
|
|
var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
|
|
|
|
|
|
- if (!data && options.toggle && option == 'show') options.toggle = false
|
|
|
+ if (!data && options.toggle && /show|hide/.test(option)) options.toggle = false
|
|
|
if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
|
|
|
if (typeof option == 'string') data[option]()
|
|
|
})
|
|
@@ -731,7 +731,7 @@ if (typeof jQuery === 'undefined') {
|
|
|
|
|
|
var $target = getTargetFromTrigger($this)
|
|
|
var data = $target.data('bs.collapse')
|
|
|
- var option = data ? 'toggle' : $.extend({}, $this.data(), { trigger: this })
|
|
|
+ var option = data ? 'toggle' : $this.data()
|
|
|
|
|
|
Plugin.call($target, option)
|
|
|
})
|
|
@@ -739,7 +739,7 @@ if (typeof jQuery === 'undefined') {
|
|
|
}(jQuery);
|
|
|
|
|
|
/* ========================================================================
|
|
|
- * Bootstrap: dropdown.js v3.3.2
|
|
|
+ * Bootstrap: dropdown.js v3.3.4
|
|
|
* http://getbootstrap.com/javascript/#dropdowns
|
|
|
* ========================================================================
|
|
|
* Copyright 2011-2015 Twitter, Inc.
|
|
@@ -759,7 +759,7 @@ if (typeof jQuery === 'undefined') {
|
|
|
$(element).on('click.bs.dropdown', this.toggle)
|
|
|
}
|
|
|
|
|
|
- Dropdown.VERSION = '3.3.2'
|
|
|
+ Dropdown.VERSION = '3.3.4'
|
|
|
|
|
|
Dropdown.prototype.toggle = function (e) {
|
|
|
var $this = $(this)
|
|
@@ -812,7 +812,7 @@ if (typeof jQuery === 'undefined') {
|
|
|
return $this.trigger('click')
|
|
|
}
|
|
|
|
|
|
- var desc = ' li:not(.divider):visible a'
|
|
|
+ var desc = ' li:not(.disabled):visible a'
|
|
|
var $items = $parent.find('[role="menu"]' + desc + ', [role="listbox"]' + desc)
|
|
|
|
|
|
if (!$items.length) return
|
|
@@ -901,7 +901,7 @@ if (typeof jQuery === 'undefined') {
|
|
|
}(jQuery);
|
|
|
|
|
|
/* ========================================================================
|
|
|
- * Bootstrap: modal.js v3.3.2
|
|
|
+ * Bootstrap: modal.js v3.3.4
|
|
|
* http://getbootstrap.com/javascript/#modals
|
|
|
* ========================================================================
|
|
|
* Copyright 2011-2015 Twitter, Inc.
|
|
@@ -916,12 +916,15 @@ if (typeof jQuery === 'undefined') {
|
|
|
// ======================
|
|
|
|
|
|
var Modal = function (element, options) {
|
|
|
- this.options = options
|
|
|
- this.$body = $(document.body)
|
|
|
- this.$element = $(element)
|
|
|
- this.$backdrop =
|
|
|
- this.isShown = null
|
|
|
- this.scrollbarWidth = 0
|
|
|
+ this.options = options
|
|
|
+ this.$body = $(document.body)
|
|
|
+ this.$element = $(element)
|
|
|
+ this.$dialog = this.$element.find('.modal-dialog')
|
|
|
+ this.$backdrop = null
|
|
|
+ this.isShown = null
|
|
|
+ this.originalBodyPad = null
|
|
|
+ this.scrollbarWidth = 0
|
|
|
+ this.ignoreBackdropClick = false
|
|
|
|
|
|
if (this.options.remote) {
|
|
|
this.$element
|
|
@@ -932,7 +935,7 @@ if (typeof jQuery === 'undefined') {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- Modal.VERSION = '3.3.2'
|
|
|
+ Modal.VERSION = '3.3.4'
|
|
|
|
|
|
Modal.TRANSITION_DURATION = 300
|
|
|
Modal.BACKDROP_TRANSITION_DURATION = 150
|
|
@@ -966,6 +969,12 @@ if (typeof jQuery === 'undefined') {
|
|
|
|
|
|
this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
|
|
|
|
|
|
+ this.$dialog.on('mousedown.dismiss.bs.modal', function () {
|
|
|
+ that.$element.one('mouseup.dismiss.bs.modal', function (e) {
|
|
|
+ if ($(e.target).is(that.$element)) that.ignoreBackdropClick = true
|
|
|
+ })
|
|
|
+ })
|
|
|
+
|
|
|
this.backdrop(function () {
|
|
|
var transition = $.support.transition && that.$element.hasClass('fade')
|
|
|
|
|
@@ -977,7 +986,6 @@ if (typeof jQuery === 'undefined') {
|
|
|
.show()
|
|
|
.scrollTop(0)
|
|
|
|
|
|
- if (that.options.backdrop) that.adjustBackdrop()
|
|
|
that.adjustDialog()
|
|
|
|
|
|
if (transition) {
|
|
@@ -993,7 +1001,7 @@ if (typeof jQuery === 'undefined') {
|
|
|
var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget })
|
|
|
|
|
|
transition ?
|
|
|
- that.$element.find('.modal-dialog') // wait for modal to slide in
|
|
|
+ that.$dialog // wait for modal to slide in
|
|
|
.one('bsTransitionEnd', function () {
|
|
|
that.$element.trigger('focus').trigger(e)
|
|
|
})
|
|
@@ -1022,6 +1030,9 @@ if (typeof jQuery === 'undefined') {
|
|
|
.removeClass('in')
|
|
|
.attr('aria-hidden', true)
|
|
|
.off('click.dismiss.bs.modal')
|
|
|
+ .off('mouseup.dismiss.bs.modal')
|
|
|
+
|
|
|
+ this.$dialog.off('mousedown.dismiss.bs.modal')
|
|
|
|
|
|
$.support.transition && this.$element.hasClass('fade') ?
|
|
|
this.$element
|
|
@@ -1082,13 +1093,18 @@ if (typeof jQuery === 'undefined') {
|
|
|
var doAnimate = $.support.transition && animate
|
|
|
|
|
|
this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
|
|
|
- .prependTo(this.$element)
|
|
|
- .on('click.dismiss.bs.modal', $.proxy(function (e) {
|
|
|
- if (e.target !== e.currentTarget) return
|
|
|
- this.options.backdrop == 'static'
|
|
|
- ? this.$element[0].focus.call(this.$element[0])
|
|
|
- : this.hide.call(this)
|
|
|
- }, this))
|
|
|
+ .appendTo(this.$body)
|
|
|
+
|
|
|
+ this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) {
|
|
|
+ if (this.ignoreBackdropClick) {
|
|
|
+ this.ignoreBackdropClick = false
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if (e.target !== e.currentTarget) return
|
|
|
+ this.options.backdrop == 'static'
|
|
|
+ ? this.$element[0].focus()
|
|
|
+ : this.hide()
|
|
|
+ }, this))
|
|
|
|
|
|
if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
|
|
|
|
|
@@ -1123,16 +1139,9 @@ if (typeof jQuery === 'undefined') {
|
|
|
// these following methods are used to handle overflowing modals
|
|
|
|
|
|
Modal.prototype.handleUpdate = function () {
|
|
|
- if (this.options.backdrop) this.adjustBackdrop()
|
|
|
this.adjustDialog()
|
|
|
}
|
|
|
|
|
|
- Modal.prototype.adjustBackdrop = function () {
|
|
|
- this.$backdrop
|
|
|
- .css('height', 0)
|
|
|
- .css('height', this.$element[0].scrollHeight)
|
|
|
- }
|
|
|
-
|
|
|
Modal.prototype.adjustDialog = function () {
|
|
|
var modalIsOverflowing = this.$element[0].scrollHeight > document.documentElement.clientHeight
|
|
|
|
|
@@ -1150,17 +1159,23 @@ if (typeof jQuery === 'undefined') {
|
|
|
}
|
|
|
|
|
|
Modal.prototype.checkScrollbar = function () {
|
|
|
- this.bodyIsOverflowing = document.body.scrollHeight > document.documentElement.clientHeight
|
|
|
+ var fullWindowWidth = window.innerWidth
|
|
|
+ if (!fullWindowWidth) { // workaround for missing window.innerWidth in IE8
|
|
|
+ var documentElementRect = document.documentElement.getBoundingClientRect()
|
|
|
+ fullWindowWidth = documentElementRect.right - Math.abs(documentElementRect.left)
|
|
|
+ }
|
|
|
+ this.bodyIsOverflowing = document.body.clientWidth < fullWindowWidth
|
|
|
this.scrollbarWidth = this.measureScrollbar()
|
|
|
}
|
|
|
|
|
|
Modal.prototype.setScrollbar = function () {
|
|
|
var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10)
|
|
|
+ this.originalBodyPad = document.body.style.paddingRight || ''
|
|
|
if (this.bodyIsOverflowing) this.$body.css('padding-right', bodyPad + this.scrollbarWidth)
|
|
|
}
|
|
|
|
|
|
Modal.prototype.resetScrollbar = function () {
|
|
|
- this.$body.css('padding-right', '')
|
|
|
+ this.$body.css('padding-right', this.originalBodyPad)
|
|
|
}
|
|
|
|
|
|
Modal.prototype.measureScrollbar = function () { // thx walsh
|
|
@@ -1226,7 +1241,7 @@ if (typeof jQuery === 'undefined') {
|
|
|
}(jQuery);
|
|
|
|
|
|
/* ========================================================================
|
|
|
- * Bootstrap: tooltip.js v3.3.2
|
|
|
+ * Bootstrap: tooltip.js v3.3.4
|
|
|
* http://getbootstrap.com/javascript/#tooltip
|
|
|
* Inspired by the original jQuery.tipsy by Jason Frame
|
|
|
* ========================================================================
|
|
@@ -1242,17 +1257,17 @@ if (typeof jQuery === 'undefined') {
|
|
|
// ===============================
|
|
|
|
|
|
var Tooltip = function (element, options) {
|
|
|
- this.type =
|
|
|
- this.options =
|
|
|
- this.enabled =
|
|
|
- this.timeout =
|
|
|
- this.hoverState =
|
|
|
+ this.type = null
|
|
|
+ this.options = null
|
|
|
+ this.enabled = null
|
|
|
+ this.timeout = null
|
|
|
+ this.hoverState = null
|
|
|
this.$element = null
|
|
|
|
|
|
this.init('tooltip', element, options)
|
|
|
}
|
|
|
|
|
|
- Tooltip.VERSION = '3.3.2'
|
|
|
+ Tooltip.VERSION = '3.3.4'
|
|
|
|
|
|
Tooltip.TRANSITION_DURATION = 150
|
|
|
|
|
@@ -1279,6 +1294,10 @@ if (typeof jQuery === 'undefined') {
|
|
|
this.options = this.getOptions(options)
|
|
|
this.$viewport = this.options.viewport && $(this.options.viewport.selector || this.options.viewport)
|
|
|
|
|
|
+ if (this.$element[0] instanceof document.constructor && !this.options.selector) {
|
|
|
+ throw new Error('`selector` option must be specified when initializing ' + this.type + ' on the window.document object!')
|
|
|
+ }
|
|
|
+
|
|
|
var triggers = this.options.trigger.split(' ')
|
|
|
|
|
|
for (var i = triggers.length; i--;) {
|
|
@@ -1499,10 +1518,10 @@ if (typeof jQuery === 'undefined') {
|
|
|
this.replaceArrow(arrowDelta, $tip[0][arrowOffsetPosition], isVertical)
|
|
|
}
|
|
|
|
|
|
- Tooltip.prototype.replaceArrow = function (delta, dimension, isHorizontal) {
|
|
|
+ Tooltip.prototype.replaceArrow = function (delta, dimension, isVertical) {
|
|
|
this.arrow()
|
|
|
- .css(isHorizontal ? 'left' : 'top', 50 * (1 - delta / dimension) + '%')
|
|
|
- .css(isHorizontal ? 'top' : 'left', '')
|
|
|
+ .css(isVertical ? 'left' : 'top', 50 * (1 - delta / dimension) + '%')
|
|
|
+ .css(isVertical ? 'top' : 'left', '')
|
|
|
}
|
|
|
|
|
|
Tooltip.prototype.setContent = function () {
|
|
@@ -1515,7 +1534,7 @@ if (typeof jQuery === 'undefined') {
|
|
|
|
|
|
Tooltip.prototype.hide = function (callback) {
|
|
|
var that = this
|
|
|
- var $tip = this.tip()
|
|
|
+ var $tip = $(this.$tip)
|
|
|
var e = $.Event('hide.bs.' + this.type)
|
|
|
|
|
|
function complete() {
|
|
@@ -1532,7 +1551,7 @@ if (typeof jQuery === 'undefined') {
|
|
|
|
|
|
$tip.removeClass('in')
|
|
|
|
|
|
- $.support.transition && this.$tip.hasClass('fade') ?
|
|
|
+ $.support.transition && $tip.hasClass('fade') ?
|
|
|
$tip
|
|
|
.one('bsTransitionEnd', complete)
|
|
|
.emulateTransitionEnd(Tooltip.TRANSITION_DURATION) :
|
|
@@ -1676,7 +1695,7 @@ if (typeof jQuery === 'undefined') {
|
|
|
var data = $this.data('bs.tooltip')
|
|
|
var options = typeof option == 'object' && option
|
|
|
|
|
|
- if (!data && option == 'destroy') return
|
|
|
+ if (!data && /destroy|hide/.test(option)) return
|
|
|
if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
|
|
|
if (typeof option == 'string') data[option]()
|
|
|
})
|
|
@@ -1699,7 +1718,7 @@ if (typeof jQuery === 'undefined') {
|
|
|
}(jQuery);
|
|
|
|
|
|
/* ========================================================================
|
|
|
- * Bootstrap: popover.js v3.3.2
|
|
|
+ * Bootstrap: popover.js v3.3.4
|
|
|
* http://getbootstrap.com/javascript/#popovers
|
|
|
* ========================================================================
|
|
|
* Copyright 2011-2015 Twitter, Inc.
|
|
@@ -1719,7 +1738,7 @@ if (typeof jQuery === 'undefined') {
|
|
|
|
|
|
if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
|
|
|
|
|
|
- Popover.VERSION = '3.3.2'
|
|
|
+ Popover.VERSION = '3.3.4'
|
|
|
|
|
|
Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
|
|
|
placement: 'right',
|
|
@@ -1775,11 +1794,6 @@ if (typeof jQuery === 'undefined') {
|
|
|
return (this.$arrow = this.$arrow || this.tip().find('.arrow'))
|
|
|
}
|
|
|
|
|
|
- Popover.prototype.tip = function () {
|
|
|
- if (!this.$tip) this.$tip = $(this.options.template)
|
|
|
- return this.$tip
|
|
|
- }
|
|
|
-
|
|
|
|
|
|
// POPOVER PLUGIN DEFINITION
|
|
|
// =========================
|
|
@@ -1790,7 +1804,7 @@ if (typeof jQuery === 'undefined') {
|
|
|
var data = $this.data('bs.popover')
|
|
|
var options = typeof option == 'object' && option
|
|
|
|
|
|
- if (!data && option == 'destroy') return
|
|
|
+ if (!data && /destroy|hide/.test(option)) return
|
|
|
if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
|
|
|
if (typeof option == 'string') data[option]()
|
|
|
})
|
|
@@ -1813,7 +1827,7 @@ if (typeof jQuery === 'undefined') {
|
|
|
}(jQuery);
|
|
|
|
|
|
/* ========================================================================
|
|
|
- * Bootstrap: scrollspy.js v3.3.2
|
|
|
+ * Bootstrap: scrollspy.js v3.3.4
|
|
|
* http://getbootstrap.com/javascript/#scrollspy
|
|
|
* ========================================================================
|
|
|
* Copyright 2011-2015 Twitter, Inc.
|
|
@@ -1828,10 +1842,8 @@ if (typeof jQuery === 'undefined') {
|
|
|
// ==========================
|
|
|
|
|
|
function ScrollSpy(element, options) {
|
|
|
- var process = $.proxy(this.process, this)
|
|
|
-
|
|
|
- this.$body = $('body')
|
|
|
- this.$scrollElement = $(element).is('body') ? $(window) : $(element)
|
|
|
+ this.$body = $(document.body)
|
|
|
+ this.$scrollElement = $(element).is(document.body) ? $(window) : $(element)
|
|
|
this.options = $.extend({}, ScrollSpy.DEFAULTS, options)
|
|
|
this.selector = (this.options.target || '') + ' .nav li > a'
|
|
|
this.offsets = []
|
|
@@ -1839,12 +1851,12 @@ if (typeof jQuery === 'undefined') {
|
|
|
this.activeTarget = null
|
|
|
this.scrollHeight = 0
|
|
|
|
|
|
- this.$scrollElement.on('scroll.bs.scrollspy', process)
|
|
|
+ this.$scrollElement.on('scroll.bs.scrollspy', $.proxy(this.process, this))
|
|
|
this.refresh()
|
|
|
this.process()
|
|
|
}
|
|
|
|
|
|
- ScrollSpy.VERSION = '3.3.2'
|
|
|
+ ScrollSpy.VERSION = '3.3.4'
|
|
|
|
|
|
ScrollSpy.DEFAULTS = {
|
|
|
offset: 10
|
|
@@ -1855,20 +1867,19 @@ if (typeof jQuery === 'undefined') {
|
|
|
}
|
|
|
|
|
|
ScrollSpy.prototype.refresh = function () {
|
|
|
- var offsetMethod = 'offset'
|
|
|
- var offsetBase = 0
|
|
|
+ var that = this
|
|
|
+ var offsetMethod = 'offset'
|
|
|
+ var offsetBase = 0
|
|
|
+
|
|
|
+ this.offsets = []
|
|
|
+ this.targets = []
|
|
|
+ this.scrollHeight = this.getScrollHeight()
|
|
|
|
|
|
if (!$.isWindow(this.$scrollElement[0])) {
|
|
|
offsetMethod = 'position'
|
|
|
offsetBase = this.$scrollElement.scrollTop()
|
|
|
}
|
|
|
|
|
|
- this.offsets = []
|
|
|
- this.targets = []
|
|
|
- this.scrollHeight = this.getScrollHeight()
|
|
|
-
|
|
|
- var self = this
|
|
|
-
|
|
|
this.$body
|
|
|
.find(this.selector)
|
|
|
.map(function () {
|
|
@@ -1883,8 +1894,8 @@ if (typeof jQuery === 'undefined') {
|
|
|
})
|
|
|
.sort(function (a, b) { return a[0] - b[0] })
|
|
|
.each(function () {
|
|
|
- self.offsets.push(this[0])
|
|
|
- self.targets.push(this[1])
|
|
|
+ that.offsets.push(this[0])
|
|
|
+ that.targets.push(this[1])
|
|
|
})
|
|
|
}
|
|
|
|
|
@@ -1913,7 +1924,7 @@ if (typeof jQuery === 'undefined') {
|
|
|
for (i = offsets.length; i--;) {
|
|
|
activeTarget != targets[i]
|
|
|
&& scrollTop >= offsets[i]
|
|
|
- && (!offsets[i + 1] || scrollTop <= offsets[i + 1])
|
|
|
+ && (offsets[i + 1] === undefined || scrollTop < offsets[i + 1])
|
|
|
&& this.activate(targets[i])
|
|
|
}
|
|
|
}
|
|
@@ -1924,8 +1935,8 @@ if (typeof jQuery === 'undefined') {
|
|
|
this.clear()
|
|
|
|
|
|
var selector = this.selector +
|
|
|
- '[data-target="' + target + '"],' +
|
|
|
- this.selector + '[href="' + target + '"]'
|
|
|
+ '[data-target="' + target + '"],' +
|
|
|
+ this.selector + '[href="' + target + '"]'
|
|
|
|
|
|
var active = $(selector)
|
|
|
.parents('li')
|
|
@@ -1989,7 +2000,7 @@ if (typeof jQuery === 'undefined') {
|
|
|
}(jQuery);
|
|
|
|
|
|
/* ========================================================================
|
|
|
- * Bootstrap: tab.js v3.3.2
|
|
|
+ * Bootstrap: tab.js v3.3.4
|
|
|
* http://getbootstrap.com/javascript/#tabs
|
|
|
* ========================================================================
|
|
|
* Copyright 2011-2015 Twitter, Inc.
|
|
@@ -2007,7 +2018,7 @@ if (typeof jQuery === 'undefined') {
|
|
|
this.element = $(element)
|
|
|
}
|
|
|
|
|
|
- Tab.VERSION = '3.3.2'
|
|
|
+ Tab.VERSION = '3.3.4'
|
|
|
|
|
|
Tab.TRANSITION_DURATION = 150
|
|
|
|
|
@@ -2078,7 +2089,7 @@ if (typeof jQuery === 'undefined') {
|
|
|
element.removeClass('fade')
|
|
|
}
|
|
|
|
|
|
- if (element.parent('.dropdown-menu')) {
|
|
|
+ if (element.parent('.dropdown-menu').length) {
|
|
|
element
|
|
|
.closest('li.dropdown')
|
|
|
.addClass('active')
|
|
@@ -2143,7 +2154,7 @@ if (typeof jQuery === 'undefined') {
|
|
|
}(jQuery);
|
|
|
|
|
|
/* ========================================================================
|
|
|
- * Bootstrap: affix.js v3.3.2
|
|
|
+ * Bootstrap: affix.js v3.3.4
|
|
|
* http://getbootstrap.com/javascript/#affix
|
|
|
* ========================================================================
|
|
|
* Copyright 2011-2015 Twitter, Inc.
|
|
@@ -2165,14 +2176,14 @@ if (typeof jQuery === 'undefined') {
|
|
|
.on('click.bs.affix.data-api', $.proxy(this.checkPositionWithEventLoop, this))
|
|
|
|
|
|
this.$element = $(element)
|
|
|
- this.affixed =
|
|
|
- this.unpin =
|
|
|
+ this.affixed = null
|
|
|
+ this.unpin = null
|
|
|
this.pinnedOffset = null
|
|
|
|
|
|
this.checkPosition()
|
|
|
}
|
|
|
|
|
|
- Affix.VERSION = '3.3.2'
|
|
|
+ Affix.VERSION = '3.3.4'
|
|
|
|
|
|
Affix.RESET = 'affix affix-top affix-bottom'
|
|
|
|
|
@@ -2222,7 +2233,7 @@ if (typeof jQuery === 'undefined') {
|
|
|
var offset = this.options.offset
|
|
|
var offsetTop = offset.top
|
|
|
var offsetBottom = offset.bottom
|
|
|
- var scrollHeight = $('body').height()
|
|
|
+ var scrollHeight = $(document.body).height()
|
|
|
|
|
|
if (typeof offset != 'object') offsetBottom = offsetTop = offset
|
|
|
if (typeof offsetTop == 'function') offsetTop = offset.top(this.$element)
|