diff options
Diffstat (limited to 'assets/javascripts/bootstrap.js')
-rw-r--r-- | assets/javascripts/bootstrap.js | 91 |
1 files changed, 53 insertions, 38 deletions
diff --git a/assets/javascripts/bootstrap.js b/assets/javascripts/bootstrap.js index e335cb4..2fd19d0 100644 --- a/assets/javascripts/bootstrap.js +++ b/assets/javascripts/bootstrap.js @@ -1,6 +1,6 @@ /*! - * Bootstrap v4.0.0-alpha.2 (http://getbootstrap.com) - * Copyright 2011-2016 Twitter, Inc. + * Bootstrap v4.0.0-alpha.3 (http://getbootstrap.com) + * Copyright 2011-2016 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ @@ -10,8 +10,8 @@ if (typeof jQuery === 'undefined') { +function ($) { var version = $.fn.jquery.split(' ')[0].split('.') - if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] >= 3)) { - throw new Error('Bootstrap\'s JavaScript requires at least jQuery v1.9.1 but less than v3.0.0') + if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] >= 4)) { + throw new Error('Bootstrap\'s JavaScript requires at least jQuery v1.9.1 but less than v4.0.0') } }(jQuery); @@ -20,7 +20,7 @@ if (typeof jQuery === 'undefined') { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.2): util.js + * Bootstrap (v4.0.0-alpha.3): util.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -45,6 +45,8 @@ var Util = (function ($) { var transition = false; + var MAX_UID = 1000000; + var TransitionEndEvent = { WebkitTransition: 'webkitTransitionEnd', MozTransition: 'transitionend', @@ -67,8 +69,9 @@ var Util = (function ($) { delegateType: transition.end, handle: function handle(event) { if ($(event.target).is(this)) { - return event.handleObj.handler.apply(this, arguments); + return event.handleObj.handler.apply(this, arguments); // eslint-disable-line prefer-rest-params } + return undefined; } }; } @@ -130,7 +133,7 @@ var Util = (function ($) { getUID: function getUID(prefix) { do { /* eslint-disable no-bitwise */ - prefix += ~ ~(Math.random() * 1000000); // "~~" acts like a faster Math.floor() here + prefix += ~ ~(Math.random() * MAX_UID); // "~~" acts like a faster Math.floor() here /* eslint-enable no-bitwise */ } while (document.getElementById(prefix)); return prefix; @@ -187,7 +190,7 @@ var Util = (function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.2): alert.js + * Bootstrap (v4.0.0-alpha.3): alert.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -201,7 +204,7 @@ var Alert = (function ($) { */ var NAME = 'alert'; - var VERSION = '4.0.0-alpha.2'; + var VERSION = '4.0.0-alpha.3'; var DATA_KEY = 'bs.alert'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -373,7 +376,7 @@ var Alert = (function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.2): button.js + * Bootstrap (v4.0.0-alpha.3): button.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -387,7 +390,7 @@ var Button = (function ($) { */ var NAME = 'button'; - var VERSION = '4.0.0-alpha.2'; + var VERSION = '4.0.0-alpha.3'; var DATA_KEY = 'bs.button'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -541,7 +544,7 @@ var Button = (function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.2): carousel.js + * Bootstrap (v4.0.0-alpha.3): carousel.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -555,12 +558,14 @@ var Carousel = (function ($) { */ var NAME = 'carousel'; - var VERSION = '4.0.0-alpha.2'; + var VERSION = '4.0.0-alpha.3'; var DATA_KEY = 'bs.carousel'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; var JQUERY_NO_CONFLICT = $.fn[NAME]; var TRANSITION_DURATION = 600; + var ARROW_LEFT_KEYCODE = 37; // KeyboardEvent.which value for left arrow key + var ARROW_RIGHT_KEYCODE = 39; // KeyboardEvent.which value for right arrow key var Default = { interval: 5000, @@ -776,10 +781,12 @@ var Carousel = (function ($) { } switch (event.which) { - case 37: - this.prev();break; - case 39: - this.next();break; + case ARROW_LEFT_KEYCODE: + this.prev(); + break; + case ARROW_RIGHT_KEYCODE: + this.next(); + break; default: return; } @@ -1013,7 +1020,7 @@ var Carousel = (function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.2): collapse.js + * Bootstrap (v4.0.0-alpha.3): collapse.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -1027,7 +1034,7 @@ var Collapse = (function ($) { */ var NAME = 'collapse'; - var VERSION = '4.0.0-alpha.2'; + var VERSION = '4.0.0-alpha.3'; var DATA_KEY = 'bs.collapse'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -1371,7 +1378,7 @@ var Collapse = (function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.2): dropdown.js + * Bootstrap (v4.0.0-alpha.3): dropdown.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -1385,11 +1392,15 @@ var Dropdown = (function ($) { */ var NAME = 'dropdown'; - var VERSION = '4.0.0-alpha.2'; + var VERSION = '4.0.0-alpha.3'; var DATA_KEY = 'bs.dropdown'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; var JQUERY_NO_CONFLICT = $.fn[NAME]; + var ESCAPE_KEYCODE = 27; // KeyboardEvent.which value for Escape (Esc) key + var ARROW_UP_KEYCODE = 38; // KeyboardEvent.which value for up arrow key + var ARROW_DOWN_KEYCODE = 40; // KeyboardEvent.which value for down arrow key + var RIGHT_MOUSE_BUTTON_WHICH = 3; // MouseEvent.which value for the right button (assuming a right-handed mouse) var Event = { HIDE: 'hide' + EVENT_KEY, @@ -1524,7 +1535,7 @@ var Dropdown = (function ($) { }, { key: '_clearMenus', value: function _clearMenus(event) { - if (event && event.which === 3) { + if (event && event.which === RIGHT_MOUSE_BUTTON_WHICH) { return; } @@ -1587,9 +1598,9 @@ var Dropdown = (function ($) { var parent = Dropdown._getParentFromElement(this); var isActive = $(parent).hasClass(ClassName.OPEN); - if (!isActive && event.which !== 27 || isActive && event.which === 27) { + if (!isActive && event.which !== ESCAPE_KEYCODE || isActive && event.which === ESCAPE_KEYCODE) { - if (event.which === 27) { + if (event.which === ESCAPE_KEYCODE) { var toggle = $(parent).find(Selector.DATA_TOGGLE)[0]; $(toggle).trigger('focus'); } @@ -1610,12 +1621,12 @@ var Dropdown = (function ($) { var index = items.indexOf(event.target); - if (event.which === 38 && index > 0) { + if (event.which === ARROW_UP_KEYCODE && index > 0) { // up index--; } - if (event.which === 40 && index < items.length - 1) { + if (event.which === ARROW_DOWN_KEYCODE && index < items.length - 1) { // down index++; } @@ -1658,7 +1669,7 @@ var Dropdown = (function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.2): modal.js + * Bootstrap (v4.0.0-alpha.3): modal.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -1672,13 +1683,14 @@ var Modal = (function ($) { */ var NAME = 'modal'; - var VERSION = '4.0.0-alpha.2'; + var VERSION = '4.0.0-alpha.3'; var DATA_KEY = 'bs.modal'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; var JQUERY_NO_CONFLICT = $.fn[NAME]; var TRANSITION_DURATION = 300; var BACKDROP_TRANSITION_DURATION = 150; + var ESCAPE_KEYCODE = 27; // KeyboardEvent.which value for Escape (Esc) key var Default = { backdrop: true, @@ -1874,6 +1886,7 @@ var Modal = (function ($) { } this._element.style.display = 'block'; + this._element.removeAttribute('aria-hidden'); this._element.scrollTop = 0; if (transition) { @@ -1922,7 +1935,7 @@ var Modal = (function ($) { if (this._isShown && this._config.keyboard) { $(this._element).on(Event.KEYDOWN_DISMISS, function (event) { - if (event.which === 27) { + if (event.which === ESCAPE_KEYCODE) { _this10.hide(); } }); @@ -1945,6 +1958,7 @@ var Modal = (function ($) { var _this11 = this; this._element.style.display = 'none'; + this._element.setAttribute('aria-hidden', 'true'); this._showBackdrop(function () { $(document.body).removeClass(ClassName.OPEN); _this11._resetAdjustments(); @@ -2050,7 +2064,7 @@ var Modal = (function ($) { } if (this._isBodyOverflowing && !isModalOverflowing) { - this._element.style.paddingRight = this._scrollbarWidth + 'px~'; + this._element.style.paddingRight = this._scrollbarWidth + 'px'; } } }, { @@ -2182,7 +2196,7 @@ var Modal = (function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.2): scrollspy.js + * Bootstrap (v4.0.0-alpha.3): scrollspy.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -2196,7 +2210,7 @@ var ScrollSpy = (function ($) { */ var NAME = 'scrollspy'; - var VERSION = '4.0.0-alpha.2'; + var VERSION = '4.0.0-alpha.3'; var DATA_KEY = 'bs.scrollspy'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -2311,6 +2325,7 @@ var ScrollSpy = (function ($) { // todo (fat): remove sketch reliance on jQuery position/offset return [$(target)[offsetMethod]().top + offsetBase, targetSelector]; } + return null; }).filter(function (item) { return item; }).sort(function (a, b) { @@ -2496,7 +2511,7 @@ var ScrollSpy = (function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.2): tab.js + * Bootstrap (v4.0.0-alpha.3): tab.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -2510,7 +2525,7 @@ var Tab = (function ($) { */ var NAME = 'tab'; - var VERSION = '4.0.0-alpha.2'; + var VERSION = '4.0.0-alpha.3'; var DATA_KEY = 'bs.tab'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -2755,7 +2770,7 @@ var Tab = (function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.2): tooltip.js + * Bootstrap (v4.0.0-alpha.3): tooltip.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -2777,7 +2792,7 @@ var Tooltip = (function ($) { */ var NAME = 'tooltip'; - var VERSION = '4.0.0-alpha.2'; + var VERSION = '4.0.0-alpha.3'; var DATA_KEY = 'bs.tooltip'; var EVENT_KEY = '.' + DATA_KEY; var JQUERY_NO_CONFLICT = $.fn[NAME]; @@ -3366,7 +3381,7 @@ var Tooltip = (function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.2): popover.js + * Bootstrap (v4.0.0-alpha.3): popover.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -3380,7 +3395,7 @@ var Popover = (function ($) { */ var NAME = 'popover'; - var VERSION = '4.0.0-alpha.2'; + var VERSION = '4.0.0-alpha.3'; var DATA_KEY = 'bs.popover'; var EVENT_KEY = '.' + DATA_KEY; var JQUERY_NO_CONFLICT = $.fn[NAME]; |