diff options
| author | Alexandr Kondrashov <[email protected]> | 2015-12-08 02:18:32 +0300 |
|---|---|---|
| committer | Alexandr Kondrashov <[email protected]> | 2015-12-08 02:18:32 +0300 |
| commit | 5f316e6dc34f57bfbd0ebf922fe5a01cc6bb38c4 (patch) | |
| tree | 2951782d8d0aadb61dae9122d0f508a75ed8e7eb /docs/dist/js/bootstrap.js | |
| parent | c9725926b2f30bed4e37f57c20ef8ffeb2fd233b (diff) | |
| parent | afbaf4350560eaf2135fb0dc6dd761ebb746ac40 (diff) | |
| download | bootstrap-5f316e6dc34f57bfbd0ebf922fe5a01cc6bb38c4.tar.xz bootstrap-5f316e6dc34f57bfbd0ebf922fe5a01cc6bb38c4.zip | |
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into patch-1
Diffstat (limited to 'docs/dist/js/bootstrap.js')
| -rw-r--r-- | docs/dist/js/bootstrap.js | 112 |
1 files changed, 72 insertions, 40 deletions
diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js index 42ea8e748..d8f68ae0f 100644 --- a/docs/dist/js/bootstrap.js +++ b/docs/dist/js/bootstrap.js @@ -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)) { - throw new Error('Bootstrap\'s JavaScript requires jQuery version 1.9.1 or higher') + 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') } }(jQuery); @@ -20,14 +20,14 @@ if (typeof jQuery === 'undefined') { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0): util.js + * Bootstrap (v4.0.0-alpha): util.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ 'use strict'; -var _get = function get(_x, _x2, _x3) { var _again = true; _function: while (_again) { var object = _x, property = _x2, receiver = _x3; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x = parent; _x2 = property; _x3 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } }; +var _get = function get(_x, _x2, _x3) { var _again = true; _function: while (_again) { var object = _x, property = _x2, receiver = _x3; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x = parent; _x2 = property; _x3 = receiver; _again = true; desc = parent = undefined; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } }; var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })(); @@ -129,7 +129,7 @@ var Util = (function ($) { getUID: function getUID(prefix) { do { - prefix += ~ ~(Math.random() * 1000000); + prefix += ~ ~(Math.random() * 1000000); // "~~" acts like a faster Math.floor() here } while (document.getElementById(prefix)); return prefix; }, @@ -185,7 +185,7 @@ var Util = (function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0): alert.js + * Bootstrap (v4.0.0-alpha): alert.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -199,7 +199,7 @@ var Alert = (function ($) { */ var NAME = 'alert'; - var VERSION = '4.0.0'; + var VERSION = '4.0.0-alpha'; var DATA_KEY = 'bs.alert'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -371,7 +371,7 @@ var Alert = (function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0): button.js + * Bootstrap (v4.0.0-alpha): button.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -385,7 +385,7 @@ var Button = (function ($) { */ var NAME = 'button'; - var VERSION = '4.0.0'; + var VERSION = '4.0.0-alpha'; var DATA_KEY = 'bs.button'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -537,7 +537,7 @@ var Button = (function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0): carousel.js + * Bootstrap (v4.0.0-alpha): carousel.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -551,7 +551,7 @@ var Carousel = (function ($) { */ var NAME = 'carousel'; - var VERSION = '4.0.0'; + var VERSION = '4.0.0-alpha'; var DATA_KEY = 'bs.carousel'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -651,6 +651,14 @@ var Carousel = (function ($) { } } }, { + key: 'nextWhenVisible', + value: function nextWhenVisible() { + // Don't call next when the page isn't visible + if (!document.hidden) { + this.next(); + } + } + }, { key: 'prev', value: function prev() { if (!this._isSliding) { @@ -685,7 +693,7 @@ var Carousel = (function ($) { } if (this._config.interval && !this._isPaused) { - this._interval = setInterval($.proxy(this.next, this), this._config.interval); + this._interval = setInterval($.proxy(document.visibilityState ? this.nextWhenVisible : this.next, this), this._config.interval); } } }, { @@ -918,7 +926,10 @@ var Carousel = (function ($) { if (typeof config === 'number') { data.to(config); - } else if (action) { + } else if (typeof action === 'string') { + if (data[action] === undefined) { + throw new Error('No method named "' + action + '"'); + } data[action](); } else if (_config.interval) { data.pause(); @@ -998,7 +1009,7 @@ var Carousel = (function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0): collapse.js + * Bootstrap (v4.0.0-alpha): collapse.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -1012,7 +1023,7 @@ var Collapse = (function ($) { */ var NAME = 'collapse'; - var VERSION = '4.0.0'; + var VERSION = '4.0.0-alpha'; var DATA_KEY = 'bs.collapse'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -1306,6 +1317,9 @@ var Collapse = (function ($) { } if (typeof config === 'string') { + if (data[config] === undefined) { + throw new Error('No method named "' + config + '"'); + } data[config](); } }); @@ -1353,7 +1367,7 @@ var Collapse = (function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0): dropdown.js + * Bootstrap (v4.0.0-alpha): dropdown.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -1367,7 +1381,7 @@ var Dropdown = (function ($) { */ var NAME = 'dropdown'; - var VERSION = '4.0.0'; + var VERSION = '4.0.0-alpha'; var DATA_KEY = 'bs.dropdown'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -1496,6 +1510,9 @@ var Dropdown = (function ($) { } if (typeof config === 'string') { + if (data[config] === undefined) { + throw new Error('No method named "' + config + '"'); + } data[config].call(this); } }); @@ -1637,7 +1654,7 @@ var Dropdown = (function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0): modal.js + * Bootstrap (v4.0.0-alpha): modal.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -1651,7 +1668,7 @@ var Modal = (function ($) { */ var NAME = 'modal'; - var VERSION = '4.0.0'; + var VERSION = '4.0.0-alpha'; var DATA_KEY = 'bs.modal'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -1769,7 +1786,7 @@ var Modal = (function ($) { $(this._dialog).on(Event.MOUSEDOWN_DISMISS, function () { $(_this7._element).one(Event.MOUSEUP_DISMISS, function (event) { if ($(event.target).is(_this7._element)) { - that._ignoreBackdropClick = true; + _this7._ignoreBackdropClick = true; } }); }); @@ -2093,6 +2110,9 @@ var Modal = (function ($) { } if (typeof config === 'string') { + if (data[config] === undefined) { + throw new Error('No method named "' + config + '"'); + } data[config](relatedTarget); } else if (_config.show) { data.show(relatedTarget); @@ -2164,7 +2184,7 @@ var Modal = (function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0): scrollspy.js + * Bootstrap (v4.0.0-alpha): scrollspy.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -2178,7 +2198,7 @@ var ScrollSpy = (function ($) { */ var NAME = 'scrollspy'; - var VERSION = '4.0.0'; + var VERSION = '4.0.0-alpha'; var DATA_KEY = 'bs.scrollspy'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -2429,6 +2449,9 @@ var ScrollSpy = (function ($) { } if (typeof config === 'string') { + if (data[config] === undefined) { + throw new Error('No method named "' + config + '"'); + } data[config](); } }); @@ -2475,7 +2498,7 @@ var ScrollSpy = (function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0): tab.js + * Bootstrap (v4.0.0-alpha): tab.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -2489,7 +2512,7 @@ var Tab = (function ($) { */ var NAME = 'tab'; - var VERSION = '4.0.0'; + var VERSION = '4.0.0-alpha'; var DATA_KEY = 'bs.tab'; var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -2692,6 +2715,9 @@ var Tab = (function ($) { } if (typeof config === 'string') { + if (data[config] === undefined) { + throw new Error('No method named "' + config + '"'); + } data[config](); } }); @@ -2727,9 +2753,11 @@ var Tab = (function ($) { return Tab; })(jQuery); +/* global Tether */ + /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0): tooltip.js + * Bootstrap (v4.0.0-alpha): tooltip.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -2737,13 +2765,21 @@ var Tab = (function ($) { var Tooltip = (function ($) { /** + * Check for Tether dependency + * Tether - http://github.hubspot.com/tether/ + */ + if (window.Tether === undefined) { + throw new Error('Bootstrap tooltips require Tether (http://github.hubspot.com/tether/)'); + } + + /** * ------------------------------------------------------------------------ * Constants * ------------------------------------------------------------------------ */ var NAME = 'tooltip'; - var VERSION = '4.0.0'; + var VERSION = '4.0.0-alpha'; var DATA_KEY = 'bs.tooltip'; var EVENT_KEY = '.' + DATA_KEY; var JQUERY_NO_CONFLICT = $.fn[NAME]; @@ -2971,7 +3007,8 @@ var Tooltip = (function ($) { classes: TetherClass, classPrefix: CLASS_PREFIX, offset: this.config.offset, - constraints: this.config.constraints + constraints: this.config.constraints, + addTargetClasses: false }); Util.reflow(tip); @@ -3093,12 +3130,6 @@ var Tooltip = (function ($) { value: function cleanupTether() { if (this._tether) { this._tether.destroy(); - - // clean up after tether's junk classes - // remove after they fix issue - // (https://github.com/HubSpot/tether/issues/36) - $(this.element).removeClass(this._removeTetherClasses); - $(this.tip).removeClass(this._removeTetherClasses); } } @@ -3137,11 +3168,6 @@ var Tooltip = (function ($) { } } }, { - key: '_removeTetherClasses', - value: function _removeTetherClasses(i, css) { - return ((css.baseVal || css).match(new RegExp('(^|\\s)' + CLASS_PREFIX + '-\\S+', 'g')) || []).join(' '); - } - }, { key: '_fixTitle', value: function _fixTitle() { var titleType = typeof this.element.getAttribute('data-original-title'); @@ -3283,6 +3309,9 @@ var Tooltip = (function ($) { } if (typeof config === 'string') { + if (data[config] === undefined) { + throw new Error('No method named "' + config + '"'); + } data[config](); } }); @@ -3339,7 +3368,7 @@ var Tooltip = (function ($) { /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0): popover.js + * Bootstrap (v4.0.0-alpha): popover.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -3353,7 +3382,7 @@ var Popover = (function ($) { */ var NAME = 'popover'; - var VERSION = '4.0.0'; + var VERSION = '4.0.0-alpha'; var DATA_KEY = 'bs.popover'; var EVENT_KEY = '.' + DATA_KEY; var JQUERY_NO_CONFLICT = $.fn[NAME]; @@ -3468,6 +3497,9 @@ var Popover = (function ($) { } if (typeof config === 'string') { + if (data[config] === undefined) { + throw new Error('No method named "' + config + '"'); + } data[config](); } }); |
