diff options
author | Thomas Park <thomas@thomaspark.me> | 2015-03-17 14:23:20 -0400 |
---|---|---|
committer | Thomas Park <thomas@thomaspark.me> | 2015-03-17 14:23:20 -0400 |
commit | 66e5c761eea0ce48fcf72844f043db4bcb43c6d9 (patch) | |
tree | e394156c0683a60f4cf7d8213fb0bbbf32001ae4 /bower_components/bootstrap-sass-official/assets/javascripts/bootstrap | |
parent | 93738d763fd08637ccfd3ab322176b70f099d309 (diff) |
update bootstrap 3.3.4
Diffstat (limited to 'bower_components/bootstrap-sass-official/assets/javascripts/bootstrap')
12 files changed, 107 insertions, 96 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 aaebc8c0..98197642 100644 --- a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/affix.js +++ b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/affix.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: affix.js v3.3.2 + * Bootstrap: affix.js v3.3.4 * http://getbootstrap.com/javascript/#affix * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -21,14 +21,14 @@ .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' @@ -78,7 +78,7 @@ 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) 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 e8212caf..1925ef01 100644 --- a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/alert.js +++ b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/alert.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: alert.js v3.3.2 + * Bootstrap: alert.js v3.3.4 * http://getbootstrap.com/javascript/#alerts * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -18,7 +18,7 @@ $(el).on('click', dismiss, this.close) } - Alert.VERSION = '3.3.2' + Alert.VERSION = '3.3.4' Alert.TRANSITION_DURATION = 150 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 4d569017..7c7c021f 100644 --- a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/button.js +++ b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/button.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: button.js v3.3.2 + * Bootstrap: button.js v3.3.4 * http://getbootstrap.com/javascript/#buttons * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -19,7 +19,7 @@ this.isLoading = false } - Button.VERSION = '3.3.2' + Button.VERSION = '3.3.4' Button.DEFAULTS = { loadingText: 'loading...' 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 450e1812..a38ef14d 100644 --- a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/carousel.js +++ b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/carousel.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: carousel.js v3.3.2 + * Bootstrap: carousel.js v3.3.4 * http://getbootstrap.com/javascript/#carousel * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -17,10 +17,10 @@ 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)) @@ -30,7 +30,7 @@ .on('mouseleave.bs.carousel', $.proxy(this.cycle, this)) } - Carousel.VERSION = '3.3.2' + Carousel.VERSION = '3.3.4' 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 2bc30e7b..954513c5 100644 --- a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/collapse.js +++ b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/collapse.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: collapse.js v3.3.2 + * Bootstrap: collapse.js v3.3.4 * http://getbootstrap.com/javascript/#collapse * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -16,7 +16,8 @@ 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) { @@ -28,13 +29,12 @@ 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 () { @@ -172,7 +172,7 @@ 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]() }) @@ -203,7 +203,7 @@ 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) }) 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 200e1c67..9874600f 100644 --- a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/dropdown.js +++ b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/dropdown.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: dropdown.js v3.3.2 + * Bootstrap: dropdown.js v3.3.4 * http://getbootstrap.com/javascript/#dropdowns * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -19,7 +19,7 @@ $(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) @@ -72,7 +72,7 @@ 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 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 e7704b8f..c1eb2a85 100644 --- a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/modal.js +++ b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/modal.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: modal.js v3.3.2 + * Bootstrap: modal.js v3.3.4 * http://getbootstrap.com/javascript/#modals * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -14,12 +14,15 @@ // ====================== 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 @@ -30,7 +33,7 @@ } } - Modal.VERSION = '3.3.2' + Modal.VERSION = '3.3.4' Modal.TRANSITION_DURATION = 300 Modal.BACKDROP_TRANSITION_DURATION = 150 @@ -64,6 +67,12 @@ 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') @@ -75,7 +84,6 @@ .show() .scrollTop(0) - if (that.options.backdrop) that.adjustBackdrop() that.adjustDialog() if (transition) { @@ -91,7 +99,7 @@ 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) }) @@ -120,6 +128,9 @@ .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 @@ -180,13 +191,18 @@ 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 @@ -221,16 +237,9 @@ // 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 @@ -248,17 +257,23 @@ } 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 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 be65b11a..0b0755ee 100644 --- a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/popover.js +++ b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/popover.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: popover.js v3.3.2 + * Bootstrap: popover.js v3.3.4 * http://getbootstrap.com/javascript/#popovers * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -19,7 +19,7 @@ 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', @@ -75,11 +75,6 @@ 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 // ========================= @@ -90,7 +85,7 @@ 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]() }) 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 0987177f..f860c1ab 100644 --- a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/scrollspy.js +++ b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/scrollspy.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: scrollspy.js v3.3.2 + * Bootstrap: scrollspy.js v3.3.4 * http://getbootstrap.com/javascript/#scrollspy * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -14,10 +14,8 @@ // ========================== 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 = [] @@ -25,12 +23,12 @@ 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 @@ -41,20 +39,19 @@ } 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 () { @@ -69,8 +66,8 @@ }) .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]) }) } @@ -99,7 +96,7 @@ 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]) } } @@ -110,8 +107,8 @@ 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') 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 ddb7fc9c..935d5bc8 100644 --- a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/tab.js +++ b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/tab.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: tab.js v3.3.2 + * Bootstrap: tab.js v3.3.4 * http://getbootstrap.com/javascript/#tabs * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -17,7 +17,7 @@ this.element = $(element) } - Tab.VERSION = '3.3.2' + Tab.VERSION = '3.3.4' Tab.TRANSITION_DURATION = 150 @@ -88,7 +88,7 @@ element.removeClass('fade') } - if (element.parent('.dropdown-menu')) { + if (element.parent('.dropdown-menu').length) { element .closest('li.dropdown') .addClass('active') 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 1856df59..27367880 100644 --- a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/tooltip.js +++ b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/tooltip.js @@ -1,5 +1,5 @@ /* ======================================================================== - * 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 * ======================================================================== @@ -15,17 +15,17 @@ // =============================== 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 @@ -52,6 +52,10 @@ 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--;) { @@ -272,10 +276,10 @@ 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 () { @@ -288,7 +292,7 @@ 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() { @@ -305,7 +309,7 @@ $tip.removeClass('in') - $.support.transition && this.$tip.hasClass('fade') ? + $.support.transition && $tip.hasClass('fade') ? $tip .one('bsTransitionEnd', complete) .emulateTransitionEnd(Tooltip.TRANSITION_DURATION) : @@ -449,7 +453,7 @@ 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]() }) 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 ec9ab682..f23e6bdf 100644 --- a/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/transition.js +++ b/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/transition.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: transition.js v3.3.2 + * Bootstrap: transition.js v3.3.4 * http://getbootstrap.com/javascript/#transitions * ======================================================================== * Copyright 2011-2015 Twitter, Inc. |