diff options
author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2017-10-19 23:48:29 +0300 |
---|---|---|
committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2017-10-19 23:48:29 +0300 |
commit | 4322a3c379b89c6c91b9d3bc3f24073567023837 (patch) | |
tree | 92a4cff22e07e217e014e0501ee180c202408499 /assets/javascripts/bootstrap | |
parent | 415995c24bc98dfb9efda792424294e82bda244b (diff) |
rake update[v4.0.0-beta.2]
Diffstat (limited to 'assets/javascripts/bootstrap')
-rw-r--r-- | assets/javascripts/bootstrap/alert.js | 6 | ||||
-rw-r--r-- | assets/javascripts/bootstrap/button.js | 6 | ||||
-rw-r--r-- | assets/javascripts/bootstrap/carousel.js | 6 | ||||
-rw-r--r-- | assets/javascripts/bootstrap/collapse.js | 6 | ||||
-rw-r--r-- | assets/javascripts/bootstrap/dropdown.js | 25 | ||||
-rw-r--r-- | assets/javascripts/bootstrap/modal.js | 19 | ||||
-rw-r--r-- | assets/javascripts/bootstrap/popover.js | 6 | ||||
-rw-r--r-- | assets/javascripts/bootstrap/scrollspy.js | 6 | ||||
-rw-r--r-- | assets/javascripts/bootstrap/tab.js | 6 | ||||
-rw-r--r-- | assets/javascripts/bootstrap/tooltip.js | 6 | ||||
-rw-r--r-- | assets/javascripts/bootstrap/util.js | 4 |
11 files changed, 53 insertions, 43 deletions
diff --git a/assets/javascripts/bootstrap/alert.js b/assets/javascripts/bootstrap/alert.js index 5985401..4c5e120 100644 --- a/assets/javascripts/bootstrap/alert.js +++ b/assets/javascripts/bootstrap/alert.js @@ -4,7 +4,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-beta): alert.js + * Bootstrap (v4.0.0-beta.2): alert.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -15,7 +15,7 @@ var Alert = function () { * ------------------------------------------------------------------------ */ var NAME = 'alert'; - var VERSION = '4.0.0-beta'; + var VERSION = '4.0.0-beta.2'; var DATA_KEY = 'bs.alert'; var EVENT_KEY = "." + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -172,4 +172,4 @@ var Alert = function () { }; return Alert; -}(jQuery); +}($); diff --git a/assets/javascripts/bootstrap/button.js b/assets/javascripts/bootstrap/button.js index 217fb34..a0de028 100644 --- a/assets/javascripts/bootstrap/button.js +++ b/assets/javascripts/bootstrap/button.js @@ -4,7 +4,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-beta): button.js + * Bootstrap (v4.0.0-beta.2): button.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -15,7 +15,7 @@ var Button = function () { * ------------------------------------------------------------------------ */ var NAME = 'button'; - var VERSION = '4.0.0-beta'; + var VERSION = '4.0.0-beta.2'; var DATA_KEY = 'bs.button'; var EVENT_KEY = "." + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -163,4 +163,4 @@ var Button = function () { }; return Button; -}(jQuery); +}($); diff --git a/assets/javascripts/bootstrap/carousel.js b/assets/javascripts/bootstrap/carousel.js index 16c23a9..e63ecc1 100644 --- a/assets/javascripts/bootstrap/carousel.js +++ b/assets/javascripts/bootstrap/carousel.js @@ -4,7 +4,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-beta): carousel.js + * Bootstrap (v4.0.0-beta.2): carousel.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -15,7 +15,7 @@ var Carousel = function () { * ------------------------------------------------------------------------ */ var NAME = 'carousel'; - var VERSION = '4.0.0-beta'; + var VERSION = '4.0.0-beta.2'; var DATA_KEY = 'bs.carousel'; var EVENT_KEY = "." + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -500,4 +500,4 @@ var Carousel = function () { }; return Carousel; -}(jQuery); +}($); diff --git a/assets/javascripts/bootstrap/collapse.js b/assets/javascripts/bootstrap/collapse.js index 6c406bd..bc124d6 100644 --- a/assets/javascripts/bootstrap/collapse.js +++ b/assets/javascripts/bootstrap/collapse.js @@ -4,7 +4,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-beta): collapse.js + * Bootstrap (v4.0.0-beta.2): collapse.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -15,7 +15,7 @@ var Collapse = function () { * ------------------------------------------------------------------------ */ var NAME = 'collapse'; - var VERSION = '4.0.0-beta'; + var VERSION = '4.0.0-beta.2'; var DATA_KEY = 'bs.collapse'; var EVENT_KEY = "." + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -367,4 +367,4 @@ var Collapse = function () { }; return Collapse; -}(jQuery); +}($); diff --git a/assets/javascripts/bootstrap/dropdown.js b/assets/javascripts/bootstrap/dropdown.js index 18af2d3..e83f0fd 100644 --- a/assets/javascripts/bootstrap/dropdown.js +++ b/assets/javascripts/bootstrap/dropdown.js @@ -4,7 +4,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-beta): dropdown.js + * Bootstrap (v4.0.0-beta.2): dropdown.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -24,7 +24,7 @@ var Dropdown = function () { var NAME = 'dropdown'; - var VERSION = '4.0.0-beta'; + var VERSION = '4.0.0-beta.2'; var DATA_KEY = 'bs.dropdown'; var EVENT_KEY = "." + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -77,7 +77,7 @@ var Dropdown = function () { flip: true }; var DefaultType = { - offset: '(number|string)', + offset: '(number|string|function)', flip: 'boolean' /** * ------------------------------------------------------------------------ @@ -225,12 +225,23 @@ var Dropdown = function () { }; _proto._getPopperConfig = function _getPopperConfig() { + var _this2 = this; + + var offsetConf = {}; + + if (typeof this._config.offset === 'function') { + offsetConf.fn = function (data) { + data.offsets = $.extend({}, data.offsets, _this2._config.offset(data.offsets) || {}); + return data; + }; + } else { + offsetConf.offset = this._config.offset; + } + var popperConfig = { placement: this._getPlacement(), modifiers: { - offset: { - offset: this._config.offset - }, + offset: offsetConf, flip: { enabled: this._config.flip } @@ -428,4 +439,4 @@ var Dropdown = function () { }; return Dropdown; -}(jQuery, Popper); +}($, Popper); diff --git a/assets/javascripts/bootstrap/modal.js b/assets/javascripts/bootstrap/modal.js index 4873d05..c6f5f60 100644 --- a/assets/javascripts/bootstrap/modal.js +++ b/assets/javascripts/bootstrap/modal.js @@ -4,7 +4,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-beta): modal.js + * Bootstrap (v4.0.0-beta.2): modal.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -15,7 +15,7 @@ var Modal = function () { * ------------------------------------------------------------------------ */ var NAME = 'modal'; - var VERSION = '4.0.0-beta'; + var VERSION = '4.0.0-beta.2'; var DATA_KEY = 'bs.modal'; var EVENT_KEY = "." + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -97,7 +97,7 @@ var Modal = function () { _proto.show = function show(relatedTarget) { var _this = this; - if (this._isTransitioning) { + if (this._isTransitioning || this._isShown) { return; } @@ -155,12 +155,6 @@ var Modal = function () { return; } - var transition = Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.FADE); - - if (transition) { - this._isTransitioning = true; - } - var hideEvent = $.Event(Event.HIDE); $(this._element).trigger(hideEvent); @@ -169,6 +163,11 @@ var Modal = function () { } this._isShown = false; + var transition = Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.FADE); + + if (transition) { + this._isTransitioning = true; + } this._setEscapeEvent(); @@ -577,4 +576,4 @@ var Modal = function () { }; return Modal; -}(jQuery); +}($); diff --git a/assets/javascripts/bootstrap/popover.js b/assets/javascripts/bootstrap/popover.js index b48520d..a317b7f 100644 --- a/assets/javascripts/bootstrap/popover.js +++ b/assets/javascripts/bootstrap/popover.js @@ -6,7 +6,7 @@ function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.crea /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-beta): popover.js + * Bootstrap (v4.0.0-beta.2): popover.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -17,7 +17,7 @@ var Popover = function () { * ------------------------------------------------------------------------ */ var NAME = 'popover'; - var VERSION = '4.0.0-beta'; + var VERSION = '4.0.0-beta.2'; var DATA_KEY = 'bs.popover'; var EVENT_KEY = "." + DATA_KEY; var JQUERY_NO_CONFLICT = $.fn[NAME]; @@ -188,4 +188,4 @@ var Popover = function () { }; return Popover; -}(jQuery); +}($); diff --git a/assets/javascripts/bootstrap/scrollspy.js b/assets/javascripts/bootstrap/scrollspy.js index 49b4879..c9218fc 100644 --- a/assets/javascripts/bootstrap/scrollspy.js +++ b/assets/javascripts/bootstrap/scrollspy.js @@ -4,7 +4,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-beta): scrollspy.js + * Bootstrap (v4.0.0-beta.2): scrollspy.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -15,7 +15,7 @@ var ScrollSpy = function () { * ------------------------------------------------------------------------ */ var NAME = 'scrollspy'; - var VERSION = '4.0.0-beta'; + var VERSION = '4.0.0-beta.2'; var DATA_KEY = 'bs.scrollspy'; var EVENT_KEY = "." + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -311,4 +311,4 @@ var ScrollSpy = function () { }; return ScrollSpy; -}(jQuery); +}($); diff --git a/assets/javascripts/bootstrap/tab.js b/assets/javascripts/bootstrap/tab.js index 32a362a..c66e82f 100644 --- a/assets/javascripts/bootstrap/tab.js +++ b/assets/javascripts/bootstrap/tab.js @@ -4,7 +4,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-beta): tab.js + * Bootstrap (v4.0.0-beta.2): tab.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -15,7 +15,7 @@ var Tab = function () { * ------------------------------------------------------------------------ */ var NAME = 'tab'; - var VERSION = '4.0.0-beta'; + var VERSION = '4.0.0-beta.2'; var DATA_KEY = 'bs.tab'; var EVENT_KEY = "." + DATA_KEY; var DATA_API_KEY = '.data-api'; @@ -255,4 +255,4 @@ var Tab = function () { }; return Tab; -}(jQuery); +}($); diff --git a/assets/javascripts/bootstrap/tooltip.js b/assets/javascripts/bootstrap/tooltip.js index 7522fc5..6d2bb1a 100644 --- a/assets/javascripts/bootstrap/tooltip.js +++ b/assets/javascripts/bootstrap/tooltip.js @@ -4,7 +4,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-beta): tooltip.js + * Bootstrap (v4.0.0-beta.2): tooltip.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -24,7 +24,7 @@ var Tooltip = function () { var NAME = 'tooltip'; - var VERSION = '4.0.0-beta'; + var VERSION = '4.0.0-beta.2'; var DATA_KEY = 'bs.tooltip'; var EVENT_KEY = "." + DATA_KEY; var JQUERY_NO_CONFLICT = $.fn[NAME]; @@ -661,4 +661,4 @@ var Tooltip = function () { }; return Tooltip; -}(jQuery, Popper); +}($, Popper); diff --git a/assets/javascripts/bootstrap/util.js b/assets/javascripts/bootstrap/util.js index d8396a3..9eb542a 100644 --- a/assets/javascripts/bootstrap/util.js +++ b/assets/javascripts/bootstrap/util.js @@ -1,6 +1,6 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-beta): util.js + * Bootstrap (v4.0.0-beta.2): util.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -138,4 +138,4 @@ var Util = function () { }; setTransitionEndSupport(); return Util; -}(jQuery); +}($); |