summaryrefslogtreecommitdiff
path: root/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap
diff options
context:
space:
mode:
Diffstat (limited to 'bower_components/bootstrap-sass-official/assets/javascripts/bootstrap')
-rw-r--r--bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/affix.js6
-rw-r--r--bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/alert.js8
-rw-r--r--bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/button.js21
-rw-r--r--bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/carousel.js6
-rw-r--r--bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/collapse.js7
-rw-r--r--bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/dropdown.js6
-rw-r--r--bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/modal.js10
-rw-r--r--bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/popover.js6
-rw-r--r--bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/scrollspy.js6
-rw-r--r--bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/tab.js6
-rw-r--r--bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/tooltip.js20
-rw-r--r--bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/transition.js4
12 files changed, 60 insertions, 46 deletions
diff --git a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/affix.js b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/affix.js
index 2c5d5d64..7f651681 100644
--- a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/affix.js
+++ b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/affix.js
@@ -1,8 +1,8 @@
/* ========================================================================
- * Bootstrap: affix.js v3.3.6
+ * Bootstrap: affix.js v3.3.7
* http://getbootstrap.com/javascript/#affix
* ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
@@ -28,7 +28,7 @@
this.checkPosition()
}
- Affix.VERSION = '3.3.6'
+ Affix.VERSION = '3.3.7'
Affix.RESET = 'affix affix-top affix-bottom'
diff --git a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/alert.js b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/alert.js
index 5536755d..db97f3b0 100644
--- a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/alert.js
+++ b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/alert.js
@@ -1,8 +1,8 @@
/* ========================================================================
- * Bootstrap: alert.js v3.3.6
+ * Bootstrap: alert.js v3.3.7
* http://getbootstrap.com/javascript/#alerts
* ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
@@ -18,7 +18,7 @@
$(el).on('click', dismiss, this.close)
}
- Alert.VERSION = '3.3.6'
+ Alert.VERSION = '3.3.7'
Alert.TRANSITION_DURATION = 150
@@ -31,7 +31,7 @@
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
}
- var $parent = $(selector)
+ var $parent = $(selector === '#' ? [] : selector)
if (e) e.preventDefault()
diff --git a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/button.js b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/button.js
index 0f36e41e..843b39c9 100644
--- a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/button.js
+++ b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/button.js
@@ -1,8 +1,8 @@
/* ========================================================================
- * Bootstrap: button.js v3.3.6
+ * Bootstrap: button.js v3.3.7
* http://getbootstrap.com/javascript/#buttons
* ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
@@ -19,7 +19,7 @@
this.isLoading = false
}
- Button.VERSION = '3.3.6'
+ Button.VERSION = '3.3.7'
Button.DEFAULTS = {
loadingText: 'loading...'
@@ -41,10 +41,10 @@
if (state == 'loadingText') {
this.isLoading = true
- $el.addClass(d).attr(d, d)
+ $el.addClass(d).attr(d, d).prop(d, true)
} else if (this.isLoading) {
this.isLoading = false
- $el.removeClass(d).removeAttr(d)
+ $el.removeClass(d).removeAttr(d).prop(d, false)
}
}, this), 0)
}
@@ -108,10 +108,15 @@
$(document)
.on('click.bs.button.data-api', '[data-toggle^="button"]', function (e) {
- var $btn = $(e.target)
- if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
+ var $btn = $(e.target).closest('.btn')
Plugin.call($btn, 'toggle')
- if (!($(e.target).is('input[type="radio"]') || $(e.target).is('input[type="checkbox"]'))) e.preventDefault()
+ if (!($(e.target).is('input[type="radio"], input[type="checkbox"]'))) {
+ // Prevent double click on radios, and the double selections (so cancellation) on checkboxes
+ e.preventDefault()
+ // The target component still receive the focus
+ if ($btn.is('input,button')) $btn.trigger('focus')
+ else $btn.find('input:visible,button:visible').first().trigger('focus')
+ }
})
.on('focus.bs.button.data-api blur.bs.button.data-api', '[data-toggle^="button"]', function (e) {
$(e.target).closest('.btn').toggleClass('focus', /^focus(in)?$/.test(e.type))
diff --git a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/carousel.js b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/carousel.js
index 6cdbc79c..6ff954c9 100644
--- a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/carousel.js
+++ b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/carousel.js
@@ -1,8 +1,8 @@
/* ========================================================================
- * Bootstrap: carousel.js v3.3.6
+ * Bootstrap: carousel.js v3.3.7
* http://getbootstrap.com/javascript/#carousel
* ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
@@ -30,7 +30,7 @@
.on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
}
- Carousel.VERSION = '3.3.6'
+ Carousel.VERSION = '3.3.7'
Carousel.TRANSITION_DURATION = 600
diff --git a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/collapse.js b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/collapse.js
index 9e26465d..12038693 100644
--- a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/collapse.js
+++ b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/collapse.js
@@ -1,11 +1,12 @@
/* ========================================================================
- * Bootstrap: collapse.js v3.3.6
+ * Bootstrap: collapse.js v3.3.7
* http://getbootstrap.com/javascript/#collapse
* ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
+/* jshint latedef: false */
+function ($) {
'use strict';
@@ -29,7 +30,7 @@
if (this.options.toggle) this.toggle()
}
- Collapse.VERSION = '3.3.6'
+ Collapse.VERSION = '3.3.7'
Collapse.TRANSITION_DURATION = 350
diff --git a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/dropdown.js b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/dropdown.js
index df6be869..04e9c2de 100644
--- a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/dropdown.js
+++ b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/dropdown.js
@@ -1,8 +1,8 @@
/* ========================================================================
- * Bootstrap: dropdown.js v3.3.6
+ * Bootstrap: dropdown.js v3.3.7
* http://getbootstrap.com/javascript/#dropdowns
* ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
@@ -19,7 +19,7 @@
$(element).on('click.bs.dropdown', this.toggle)
}
- Dropdown.VERSION = '3.3.6'
+ Dropdown.VERSION = '3.3.7'
function getParent($this) {
var selector = $this.attr('data-target')
diff --git a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/modal.js b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/modal.js
index 5049cccf..f84142d8 100644
--- a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/modal.js
+++ b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/modal.js
@@ -1,8 +1,8 @@
/* ========================================================================
- * Bootstrap: modal.js v3.3.6
+ * Bootstrap: modal.js v3.3.7
* http://getbootstrap.com/javascript/#modals
* ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
@@ -33,7 +33,7 @@
}
}
- Modal.VERSION = '3.3.6'
+ Modal.VERSION = '3.3.7'
Modal.TRANSITION_DURATION = 300
Modal.BACKDROP_TRANSITION_DURATION = 150
@@ -140,7 +140,9 @@
$(document)
.off('focusin.bs.modal') // guard against infinite focus loop
.on('focusin.bs.modal', $.proxy(function (e) {
- if (this.$element[0] !== e.target && !this.$element.has(e.target).length) {
+ if (document !== e.target &&
+ this.$element[0] !== e.target &&
+ !this.$element.has(e.target).length) {
this.$element.trigger('focus')
}
}, this))
diff --git a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/popover.js b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/popover.js
index f2362e01..efe19567 100644
--- a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/popover.js
+++ b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/popover.js
@@ -1,8 +1,8 @@
/* ========================================================================
- * Bootstrap: popover.js v3.3.6
+ * Bootstrap: popover.js v3.3.7
* http://getbootstrap.com/javascript/#popovers
* ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
@@ -19,7 +19,7 @@
if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
- Popover.VERSION = '3.3.6'
+ Popover.VERSION = '3.3.7'
Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
placement: 'right',
diff --git a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/scrollspy.js b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/scrollspy.js
index 5970b06f..fe198095 100644
--- a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/scrollspy.js
+++ b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/scrollspy.js
@@ -1,8 +1,8 @@
/* ========================================================================
- * Bootstrap: scrollspy.js v3.3.6
+ * Bootstrap: scrollspy.js v3.3.7
* http://getbootstrap.com/javascript/#scrollspy
* ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
@@ -28,7 +28,7 @@
this.process()
}
- ScrollSpy.VERSION = '3.3.6'
+ ScrollSpy.VERSION = '3.3.7'
ScrollSpy.DEFAULTS = {
offset: 10
diff --git a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/tab.js b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/tab.js
index 7d533e8d..c4a86354 100644
--- a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/tab.js
+++ b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/tab.js
@@ -1,8 +1,8 @@
/* ========================================================================
- * Bootstrap: tab.js v3.3.6
+ * Bootstrap: tab.js v3.3.7
* http://getbootstrap.com/javascript/#tabs
* ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
@@ -19,7 +19,7 @@
// jscs:enable requireDollarBeforejQueryAssignment
}
- Tab.VERSION = '3.3.6'
+ Tab.VERSION = '3.3.7'
Tab.TRANSITION_DURATION = 150
diff --git a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/tooltip.js b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/tooltip.js
index 7094b34d..e35d9c7c 100644
--- a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/tooltip.js
+++ b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/tooltip.js
@@ -1,9 +1,9 @@
/* ========================================================================
- * Bootstrap: tooltip.js v3.3.6
+ * Bootstrap: tooltip.js v3.3.7
* http://getbootstrap.com/javascript/#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame
* ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
@@ -26,7 +26,7 @@
this.init('tooltip', element, options)
}
- Tooltip.VERSION = '3.3.6'
+ Tooltip.VERSION = '3.3.7'
Tooltip.TRANSITION_DURATION = 150
@@ -317,9 +317,11 @@
function complete() {
if (that.hoverState != 'in') $tip.detach()
- that.$element
- .removeAttr('aria-describedby')
- .trigger('hidden.bs.' + that.type)
+ if (that.$element) { // TODO: Check whether guarding this code with this `if` is really necessary.
+ that.$element
+ .removeAttr('aria-describedby')
+ .trigger('hidden.bs.' + that.type)
+ }
callback && callback()
}
@@ -362,7 +364,10 @@
// width and height are missing in IE8, so compute them manually; see https://github.com/twbs/bootstrap/issues/14093
elRect = $.extend({}, elRect, { width: elRect.right - elRect.left, height: elRect.bottom - elRect.top })
}
- var elOffset = isBody ? { top: 0, left: 0 } : $element.offset()
+ var isSvg = window.SVGElement && el instanceof window.SVGElement
+ // Avoid using $.offset() on SVGs since it gives incorrect results in jQuery 3.
+ // See https://github.com/twbs/bootstrap/issues/20280
+ var elOffset = isBody ? { top: 0, left: 0 } : (isSvg ? null : $element.offset())
var scroll = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() }
var outerDims = isBody ? { width: $(window).width(), height: $(window).height() } : null
@@ -478,6 +483,7 @@
that.$tip = null
that.$arrow = null
that.$viewport = null
+ that.$element = null
})
}
diff --git a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/transition.js b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/transition.js
index fae36ed9..db76596e 100644
--- a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/transition.js
+++ b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/transition.js
@@ -1,8 +1,8 @@
/* ========================================================================
- * Bootstrap: transition.js v3.3.6
+ * Bootstrap: transition.js v3.3.7
* http://getbootstrap.com/javascript/#transitions
* ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */