From f8b2569ec8956a1f4d09fe6fc9865bd200ecde43 Mon Sep 17 00:00:00 2001 From: fat Date: Wed, 13 May 2015 12:48:34 -0700 Subject: [PATCH] implement global dispose method --- Gruntfile.js | 4 +- dist/js/bootstrap.js | 353 +++++++++++++++++++++++++++------------ dist/js/bootstrap.min.js | 4 +- dist/js/umd/alert.js | 16 +- dist/js/umd/button.js | 16 +- dist/js/umd/carousel.js | 36 +++- dist/js/umd/collapse.js | 27 ++- dist/js/umd/dropdown.js | 37 +++- dist/js/umd/modal.js | 62 ++++--- dist/js/umd/popover.js | 26 +-- dist/js/umd/scrollspy.js | 26 ++- dist/js/umd/tab.js | 20 ++- dist/js/umd/tooltip.js | 87 ++++++---- js/dist/alert.js | 16 +- js/dist/alert.js.map | Bin 7240 -> 7682 bytes js/dist/button.js | 16 +- js/dist/button.js.map | Bin 7683 -> 8203 bytes js/dist/carousel.js | 36 +++- js/dist/carousel.js.map | Bin 21247 -> 22606 bytes js/dist/collapse.js | 27 ++- js/dist/collapse.js.map | Bin 16871 -> 17628 bytes js/dist/dropdown.js | 37 +++- js/dist/dropdown.js.map | Bin 13656 -> 14511 bytes js/dist/modal.js | 62 ++++--- js/dist/modal.js.map | Bin 24804 -> 26483 bytes js/dist/popover.js | 26 +-- js/dist/popover.js.map | Bin 7674 -> 7912 bytes js/dist/scrollspy.js | 26 ++- js/dist/scrollspy.js.map | Bin 13358 -> 14460 bytes js/dist/tab.js | 20 ++- js/dist/tab.js.map | Bin 13284 -> 13774 bytes js/dist/tooltip.js | 87 ++++++---- js/dist/tooltip.js.map | Bin 27914 -> 28676 bytes js/src/alert.js | 15 +- js/src/button.js | 16 +- js/src/carousel.js | 37 +++- js/src/collapse.js | 26 ++- js/src/dropdown.js | 45 +++-- js/src/modal.js | 61 ++++--- js/src/popover.js | 25 +-- js/src/scrollspy.js | 25 ++- js/src/tab.js | 19 ++- js/src/tooltip.js | 53 +++--- js/tests/unit/popover.js | 4 +- js/tests/unit/tooltip.js | 2 +- 45 files changed, 966 insertions(+), 429 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index f4a907b0c..98cc655f9 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -70,7 +70,7 @@ module.exports = function (grunt) { }, babel: { - src: { + dev: { options: { sourceMap: true, modules: 'ignore' @@ -352,7 +352,7 @@ module.exports = function (grunt) { watch: { src: { files: '<%= jscs.core.src %>', - tasks: ['qunit', 'concat'] + tasks: ['babel:dev'] }, test: { files: '<%= jscs.test.src %>', diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 4b7decaf1..725f4f828 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -169,6 +169,8 @@ var Alert = (function ($) { var NAME = 'alert'; var VERSION = '4.0.0'; var DATA_KEY = 'bs.alert'; + var EVENT_KEY = '.' + DATA_KEY; + var DATA_API_KEY = '.data-api'; var JQUERY_NO_CONFLICT = $.fn[NAME]; var TRANSITION_DURATION = 150; @@ -177,9 +179,9 @@ var Alert = (function ($) { }; var Event = { - CLOSE: 'close.bs.alert', - CLOSED: 'closed.bs.alert', - CLICK: 'click.bs.alert.data-api' + CLOSE: 'close' + EVENT_KEY, + CLOSED: 'closed' + EVENT_KEY, + CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY }; var ClassName = { @@ -218,6 +220,12 @@ var Alert = (function ($) { this._removeElement(rootElement); } + }, { + key: 'dispose', + value: function dispose() { + $.removeData(this._element, DATA_KEY); + this._element = null; + } }, { key: '_getRootElement', @@ -311,7 +319,7 @@ var Alert = (function ($) { * ------------------------------------------------------------------------ */ - $(document).on(Event.CLICK, Selector.DISMISS, Alert._handleDismiss(new Alert())); + $(document).on(Event.CLICK_DATA_API, Selector.DISMISS, Alert._handleDismiss(new Alert())); /** * ------------------------------------------------------------------------ @@ -347,6 +355,8 @@ var Button = (function ($) { var NAME = 'button'; var VERSION = '4.0.0'; var DATA_KEY = 'bs.button'; + var EVENT_KEY = '.' + DATA_KEY; + var DATA_API_KEY = '.data-api'; var JQUERY_NO_CONFLICT = $.fn[NAME]; var TRANSITION_DURATION = 150; @@ -365,8 +375,8 @@ var Button = (function ($) { }; var Event = { - CLICK: 'click.bs.button.data-api', - FOCUS_BLUR: 'focus.bs.button.data-api blur.bs.button.data-api' + CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY, + FOCUS_BLUR_DATA_API: 'focus' + EVENT_KEY + '' + DATA_API_KEY + ' ' + ('blur' + EVENT_KEY + '' + DATA_API_KEY) }; /** @@ -420,6 +430,12 @@ var Button = (function ($) { $(this._element).toggleClass(ClassName.ACTIVE); } } + }, { + key: 'dispose', + value: function dispose() { + $.removeData(this._element, DATA_KEY); + this._element = null; + } }], [{ key: 'VERSION', @@ -458,7 +474,7 @@ var Button = (function ($) { * ------------------------------------------------------------------------ */ - $(document).on(Event.CLICK, Selector.DATA_TOGGLE_CARROT, function (event) { + $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE_CARROT, function (event) { event.preventDefault(); var button = event.target; @@ -468,7 +484,7 @@ var Button = (function ($) { } Button._jQueryInterface.call($(button), 'toggle'); - }).on(Event.FOCUS_BLUR, Selector.DATA_TOGGLE_CARROT, function (event) { + }).on(Event.FOCUS_BLUR_DATA_API, Selector.DATA_TOGGLE_CARROT, function (event) { var button = $(event.target).closest(Selector.BUTTON)[0]; $(button).toggleClass(ClassName.FOCUS, /^focus(in)?$/.test(event.type)); }); @@ -507,6 +523,8 @@ var Carousel = (function ($) { var NAME = 'carousel'; var VERSION = '4.0.0'; 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; @@ -524,10 +542,13 @@ var Carousel = (function ($) { }; var Event = { - SLIDE: 'slide.bs.carousel', - SLID: 'slid.bs.carousel', - CLICK: 'click.bs.carousel.data-api', - LOAD: 'load' + SLIDE: 'slide' + EVENT_KEY, + SLID: 'slid' + EVENT_KEY, + KEYDOWN: 'keydown' + EVENT_KEY, + MOUSEENTER: 'mouseenter' + EVENT_KEY, + MOUSELEAVE: 'mouseleave' + EVENT_KEY, + LOAD_DATA_API: 'load' + EVENT_KEY + '' + DATA_API_KEY, + CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY }; var ClassName = { @@ -651,6 +672,21 @@ var Carousel = (function ($) { this._slide(direction, this._items[index]); } + }, { + key: 'dispose', + value: function dispose() { + $(this._element).off(EVENT_KEY); + $.removeData(this._element, DATA_KEY); + + this._items = null; + this._config = null; + this._element = null; + this._interval = null; + this._isPaused = null; + this._isSliding = null; + this._activeElement = null; + this._indicatorsElement = null; + } }, { key: '_addEventListeners', @@ -658,11 +694,11 @@ var Carousel = (function ($) { value: function _addEventListeners() { if (this._config.keyboard) { - $(this._element).on('keydown.bs.carousel', $.proxy(this._keydown, this)); + $(this._element).on(Event.KEYDOWN, $.proxy(this._keydown, this)); } if (this._config.pause == 'hover' && !('ontouchstart' in document.documentElement)) { - $(this._element).on('mouseenter.bs.carousel', $.proxy(this.pause, this)).on('mouseleave.bs.carousel', $.proxy(this.cycle, this)); + $(this._element).on(Event.MOUSEENTER, $.proxy(this.pause, this)).on(Event.MOUSELEAVE, $.proxy(this.cycle, this)); } } }, { @@ -889,9 +925,9 @@ var Carousel = (function ($) { * ------------------------------------------------------------------------ */ - $(document).on(Event.CLICK, Selector.DATA_SLIDE, Carousel._dataApiClickHandler); + $(document).on(Event.CLICK_DATA_API, Selector.DATA_SLIDE, Carousel._dataApiClickHandler); - $(window).on(Event.LOAD, function () { + $(window).on(Event.LOAD_DATA_API, function () { $(Selector.DATA_RIDE).each(function () { var $carousel = $(this); Carousel._jQueryInterface.call($carousel, $carousel.data()); @@ -932,6 +968,8 @@ var Collapse = (function ($) { var NAME = 'collapse'; var VERSION = '4.0.0'; var DATA_KEY = 'bs.collapse'; + var EVENT_KEY = '.' + DATA_KEY; + var DATA_API_KEY = '.data-api'; var JQUERY_NO_CONFLICT = $.fn[NAME]; var TRANSITION_DURATION = 600; @@ -941,11 +979,11 @@ var Collapse = (function ($) { }; var Event = { - SHOW: 'show.bs.collapse', - SHOWN: 'shown.bs.collapse', - HIDE: 'hide.bs.collapse', - HIDDEN: 'hidden.bs.collapse', - CLICK: 'click.bs.collapse.data-api' + SHOW: 'show' + EVENT_KEY, + SHOWN: 'shown' + EVENT_KEY, + HIDE: 'hide' + EVENT_KEY, + HIDDEN: 'hidden' + EVENT_KEY, + CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY }; var ClassName = { @@ -1012,8 +1050,8 @@ var Collapse = (function ($) { return; } - var activesData = undefined; var actives = undefined; + var activesData = undefined; if (this._parent) { actives = $.makeArray($(Selector.ACTIVES)); @@ -1126,6 +1164,17 @@ var Collapse = (function ($) { value: function setTransitioning(isTransitioning) { this._isTransitioning = isTransitioning; } + }, { + key: 'dispose', + value: function dispose() { + $.removeData(this._element, DATA_KEY); + + this._config = null; + this._parent = null; + this._element = null; + this._triggerArray = null; + this._isTransitioning = null; + } }, { key: '_getDimension', @@ -1216,7 +1265,7 @@ var Collapse = (function ($) { * ------------------------------------------------------------------------ */ - $(document).on(Event.CLICK, Selector.DATA_TOGGLE, function (event) { + $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { event.preventDefault(); var target = Collapse._getTargetFromElement(this); @@ -1261,16 +1310,18 @@ var Dropdown = (function ($) { var NAME = 'dropdown'; var VERSION = '4.0.0'; var DATA_KEY = 'bs.dropdown'; + var EVENT_KEY = '.' + DATA_KEY; + var DATA_API_KEY = '.data-api'; var JQUERY_NO_CONFLICT = $.fn[NAME]; var Event = { - HIDE: 'hide.bs.dropdown', - HIDDEN: 'hidden.bs.dropdown', - SHOW: 'show.bs.dropdown', - SHOWN: 'shown.bs.dropdown', - CLICK: 'click.bs.dropdown', - KEYDOWN: 'keydown.bs.dropdown.data-api', - CLICK_DATA: 'click.bs.dropdown.data-api' + HIDE: 'hide' + EVENT_KEY, + HIDDEN: 'hidden' + EVENT_KEY, + SHOW: 'show' + EVENT_KEY, + SHOWN: 'shown' + EVENT_KEY, + CLICK: 'click' + EVENT_KEY, + CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY, + KEYDOWN_DATA_API: 'keydown' + EVENT_KEY + '' + DATA_API_KEY }; var ClassName = { @@ -1299,7 +1350,9 @@ var Dropdown = (function ($) { function Dropdown(element) { _classCallCheck(this, Dropdown); - $(element).on(Event.CLICK, this.toggle); + this._element = element; + + this._addEventListeners(); } _createClass(Dropdown, [{ @@ -1347,6 +1400,21 @@ var Dropdown = (function ($) { return false; } + }, { + key: 'dispose', + value: function dispose() { + $.removeData(this._element, DATA_KEY); + $(this._element).off(EVENT_KEY); + this._element = null; + } + }, { + key: '_addEventListeners', + + // private + + value: function _addEventListeners() { + $(this._element).on(Event.CLICK, this.toggle); + } }], [{ key: 'VERSION', @@ -1479,7 +1547,7 @@ var Dropdown = (function ($) { * ------------------------------------------------------------------------ */ - $(document).on(Event.KEYDOWN, Selector.DATA_TOGGLE, Dropdown._dataApiKeydownHandler).on(Event.KEYDOWN, Selector.ROLE_MENU, Dropdown._dataApiKeydownHandler).on(Event.KEYDOWN, Selector.ROLE_LISTBOX, Dropdown._dataApiKeydownHandler).on(Event.CLICK_DATA, Dropdown._clearMenus).on(Event.CLICK_DATA, Selector.DATA_TOGGLE, Dropdown.prototype.toggle).on(Event.CLICK_DATA, Selector.FORM_CHILD, function (e) { + $(document).on(Event.KEYDOWN_DATA_API, Selector.DATA_TOGGLE, Dropdown._dataApiKeydownHandler).on(Event.KEYDOWN_DATA_API, Selector.ROLE_MENU, Dropdown._dataApiKeydownHandler).on(Event.KEYDOWN_DATA_API, Selector.ROLE_LISTBOX, Dropdown._dataApiKeydownHandler).on(Event.CLICK_DATA_API, Dropdown._clearMenus).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, Dropdown.prototype.toggle).on(Event.CLICK_DATA_API, Selector.FORM_CHILD, function (e) { e.stopPropagation(); }); @@ -1517,6 +1585,8 @@ var Modal = (function ($) { var NAME = 'modal'; var VERSION = '4.0.0'; 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; @@ -1528,17 +1598,17 @@ var Modal = (function ($) { }; var Event = { - HIDE: 'hide.bs.modal', - HIDDEN: 'hidden.bs.modal', - SHOW: 'show.bs.modal', - SHOWN: 'shown.bs.modal', - DISMISS: 'click.dismiss.bs.modal', - KEYDOWN: 'keydown.dismiss.bs.modal', - FOCUSIN: 'focusin.bs.modal', - RESIZE: 'resize.bs.modal', - CLICK: 'click.bs.modal.data-api', - MOUSEDOWN: 'mousedown.dismiss.bs.modal', - MOUSEUP: 'mouseup.dismiss.bs.modal' + HIDE: 'hide' + EVENT_KEY, + HIDDEN: 'hidden' + EVENT_KEY, + SHOW: 'show' + EVENT_KEY, + SHOWN: 'shown' + EVENT_KEY, + FOCUSIN: 'focusin' + EVENT_KEY, + RESIZE: 'resize' + EVENT_KEY, + CLICK_DISMISS: 'click.dismiss' + EVENT_KEY, + KEYDOWN_DISMISS: 'keydown.dismiss' + EVENT_KEY, + MOUSEUP_DISMISS: 'mouseup.dismiss' + EVENT_KEY, + MOUSEDOWN_DISMISS: 'mousedown.dismiss' + EVENT_KEY, + CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY }; var ClassName = { @@ -1609,10 +1679,10 @@ var Modal = (function ($) { this._setEscapeEvent(); this._setResizeEvent(); - $(this._element).on(Event.DISMISS, Selector.DATA_DISMISS, $.proxy(this.hide, this)); + $(this._element).on(Event.CLICK_DISMISS, Selector.DATA_DISMISS, $.proxy(this.hide, this)); - $(this._dialog).on(Event.MOUSEDOWN, function () { - $(_this7._element).one(Event.MOUSEUP, function (event) { + $(this._dialog).on(Event.MOUSEDOWN_DISMISS, function () { + $(_this7._element).one(Event.MOUSEUP_DISMISS, function (event) { if ($(event.target).is(_this7._element)) { that._ignoreBackdropClick = true; } @@ -1645,8 +1715,8 @@ var Modal = (function ($) { $(this._element).removeClass(ClassName.IN); - $(this._element).off(Event.DISMISS); - $(this._dialog).off(Event.MOUSEDOWN); + $(this._element).off(Event.CLICK_DISMISS); + $(this._dialog).off(Event.MOUSEDOWN_DISMISS); if (Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.FADE)) { @@ -1655,6 +1725,26 @@ var Modal = (function ($) { this._hideModal(); } } + }, { + key: 'dispose', + value: function dispose() { + $.removeData(this._element, DATA_KEY); + + $(window).off(EVENT_KEY); + $(document).off(EVENT_KEY); + $(this._element).off(EVENT_KEY); + $(this._backdrop).off(EVENT_KEY); + + this._config = null; + this._element = null; + this._dialog = null; + this._backdrop = null; + this._isShown = null; + this._isBodyOverflowing = null; + this._ignoreBackdropClick = null; + this._originalBodyPadding = null; + this._scrollbarWidth = null; + } }, { key: '_showElement', @@ -1714,13 +1804,13 @@ var Modal = (function ($) { var _this10 = this; if (this._isShown && this._config.keyboard) { - $(this._element).on(Event.KEYDOWN, function (event) { + $(this._element).on(Event.KEYDOWN_DISMISS, function (event) { if (event.which === 27) { _this10.hide(); } }); } else if (!this._isShown) { - $(this._element).off(Event.KEYDOWN); + $(this._element).off(Event.KEYDOWN_DISMISS); } } }, { @@ -1772,7 +1862,7 @@ var Modal = (function ($) { $(this._backdrop).appendTo(this.$body); - $(this._element).on(Event.DISMISS, function (event) { + $(this._element).on(Event.CLICK_DISMISS, function (event) { if (_this12._ignoreBackdropClick) { _this12._ignoreBackdropClick = false; return; @@ -1937,7 +2027,7 @@ var Modal = (function ($) { * ------------------------------------------------------------------------ */ - $(document).on(Event.CLICK, Selector.DATA_TOGGLE, function (event) { + $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { var _this13 = this; var target = undefined; @@ -2003,6 +2093,8 @@ var ScrollSpy = (function ($) { var NAME = 'scrollspy'; var VERSION = '4.0.0'; var DATA_KEY = 'bs.scrollspy'; + var EVENT_KEY = '.' + DATA_KEY; + var DATA_API_KEY = '.data-api'; var JQUERY_NO_CONFLICT = $.fn[NAME]; var Default = { @@ -2010,9 +2102,9 @@ var ScrollSpy = (function ($) { }; var Event = { - ACTIVATE: 'activate.bs.scrollspy', - SCROLL: 'scroll.bs.scrollspy', - LOAD: 'load.bs.scrollspy.data-api' + ACTIVATE: 'activate' + EVENT_KEY, + SCROLL: 'scroll' + EVENT_KEY, + LOAD_DATA_API: 'load' + EVENT_KEY + '' + DATA_API_KEY }; var ClassName = { @@ -2037,6 +2129,7 @@ var ScrollSpy = (function ($) { function ScrollSpy(element, config) { _classCallCheck(this, ScrollSpy); + this._element = element; this._scrollElement = element.tagName === 'BODY' ? window : element; this._config = $.extend({}, Default, config); this._selector = '' + (this._config.target || '') + ' .nav li > a'; @@ -2095,6 +2188,21 @@ var ScrollSpy = (function ($) { _this14._targets.push(item[1]); }); } + }, { + key: 'dispose', + value: function dispose() { + $.removeData(this._element, DATA_KEY); + $(this._scrollElement).off(EVENT_KEY); + + this._element = null; + this._scrollElement = null; + this._config = null; + this._selector = null; + this._offsets = null; + this._targets = null; + this._activeTarget = null; + this._scrollHeight = null; + } }, { key: '_getScrollTop', @@ -2221,7 +2329,7 @@ var ScrollSpy = (function ($) { * ------------------------------------------------------------------------ */ - $(window).on(Event.LOAD, function () { + $(window).on(Event.LOAD_DATA_API, function () { var scrollSpys = $.makeArray($(Selector.DATA_SPY)); for (var i = scrollSpys.length; i--;) { @@ -2264,15 +2372,17 @@ var Tab = (function ($) { var NAME = 'tab'; var VERSION = '4.0.0'; var DATA_KEY = 'bs.tab'; + var EVENT_KEY = '.' + DATA_KEY; + var DATA_API_KEY = '.data-api'; var JQUERY_NO_CONFLICT = $.fn[NAME]; var TRANSITION_DURATION = 150; var Event = { - HIDE: 'hide.bs.tab', - HIDDEN: 'hidden.bs.tab', - SHOW: 'show.bs.tab', - SHOWN: 'shown.bs.tab', - CLICK: 'click.bs.tab.data-api' + HIDE: 'hide' + EVENT_KEY, + HIDDEN: 'hidden' + EVENT_KEY, + SHOW: 'show' + EVENT_KEY, + SHOWN: 'shown' + EVENT_KEY, + CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY }; var ClassName = { @@ -2376,6 +2486,12 @@ var Tab = (function ($) { complete(); } } + }, { + key: 'dispose', + value: function dispose() { + $.removeClass(this._element, DATA_KEY); + this._element = null; + } }, { key: '_activate', @@ -2489,7 +2605,7 @@ var Tab = (function ($) { * ------------------------------------------------------------------------ */ - $(document).on(Event.CLICK, Selector.DATA_TOGGLE, function (event) { + $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { event.preventDefault(); Tab._jQueryInterface.call($(this), 'show'); }); @@ -2528,6 +2644,7 @@ var Tooltip = (function ($) { var NAME = 'tooltip'; var VERSION = '4.0.0'; var DATA_KEY = 'bs.tooltip'; + var EVENT_KEY = '.' + DATA_KEY; var JQUERY_NO_CONFLICT = $.fn[NAME]; var TRANSITION_DURATION = 150; var CLASS_PREFIX = 'bs-tether'; @@ -2558,16 +2675,16 @@ var Tooltip = (function ($) { }; var Event = { - HIDE: 'hide.bs.tooltip', - HIDDEN: 'hidden.bs.tooltip', - SHOW: 'show.bs.tooltip', - SHOWN: 'shown.bs.tooltip', - INSERTED: 'inserted.bs.tooltip', - CLICK: 'click.bs.tooltip', - FOCUSIN: 'focusin.bs.tooltip', - FOCUSOUT: 'focusout.bs.tooltip', - MOUSEENTER: 'mouseenter.bs.tooltip', - MOUSELEAVE: 'mouseleave.bs.tooltip' + HIDE: 'hide' + EVENT_KEY, + HIDDEN: 'hidden' + EVENT_KEY, + SHOW: 'show' + EVENT_KEY, + SHOWN: 'shown' + EVENT_KEY, + INSERTED: 'inserted' + EVENT_KEY, + CLICK: 'click' + EVENT_KEY, + FOCUSIN: 'focusin' + EVENT_KEY, + FOCUSOUT: 'focusout' + EVENT_KEY, + MOUSEENTER: 'mouseenter' + EVENT_KEY, + MOUSELEAVE: 'mouseleave' + EVENT_KEY }; var ClassName = { @@ -2661,25 +2778,34 @@ var Tooltip = (function ($) { } } }, { - key: 'destroy', - value: function destroy() { - var _this16 = this; - + key: 'dispose', + value: function dispose() { clearTimeout(this._timeout); - this.hide(function () { - $(_this16.element).off('.' + _this16.constructor.NAME).removeData(_this16.constructor.DATA_KEY); - if (_this16.tip) { - $(_this16.tip).detach(); - } + this.cleanupTether(); - _this16.tip = null; - }); + $.removeData(this.element, this.constructor.DATA_KEY); + + $(this.element).off(this.constructor.EVENT_KEY); + + if (this.tip) { + $(this.tip).remove(); + } + + this._isEnabled = null; + this._timeout = null; + this._hoverState = null; + this._activeTrigger = null; + this._tether = null; + + this.element = null; + this.config = null; + this.tip = null; } }, { key: 'show', value: function show() { - var _this17 = this; + var _this16 = this; var showEvent = $.Event(this.constructor.Event.SHOW); @@ -2728,13 +2854,13 @@ var Tooltip = (function ($) { $(tip).addClass(ClassName.IN); var complete = function complete() { - var prevHoverState = _this17._hoverState; - _this17._hoverState = null; + var prevHoverState = _this16._hoverState; + _this16._hoverState = null; - $(_this17.element).trigger(_this17.constructor.Event.SHOWN); + $(_this16.element).trigger(_this16.constructor.Event.SHOWN); if (prevHoverState === HoverState.OUT) { - _this17._leave(null, _this17); + _this16._leave(null, _this16); } }; @@ -2744,18 +2870,18 @@ var Tooltip = (function ($) { }, { key: 'hide', value: function hide(callback) { - var _this18 = this; + var _this17 = this; var tip = this.getTipElement(); var hideEvent = $.Event(this.constructor.Event.HIDE); var complete = function complete() { - if (_this18._hoverState !== HoverState.IN && tip.parentNode) { + if (_this17._hoverState !== HoverState.IN && tip.parentNode) { tip.parentNode.removeChild(tip); } - _this18.element.removeAttribute('aria-describedby'); - $(_this18.element).trigger(_this18.constructor.Event.HIDDEN); - _this18.cleanupTether(); + _this17.element.removeAttribute('aria-describedby'); + $(_this17.element).trigger(_this17.constructor.Event.HIDDEN); + _this17.cleanupTether(); if (callback) { callback(); @@ -2840,18 +2966,18 @@ var Tooltip = (function ($) { }, { key: '_setListeners', value: function _setListeners() { - var _this19 = this; + var _this18 = this; var triggers = this.config.trigger.split(' '); triggers.forEach(function (trigger) { if (trigger === 'click') { - $(_this19.element).on(_this19.constructor.Event.CLICK, _this19.config.selector, $.proxy(_this19.toggle, _this19)); + $(_this18.element).on(_this18.constructor.Event.CLICK, _this18.config.selector, $.proxy(_this18.toggle, _this18)); } else if (trigger !== Trigger.MANUAL) { - var eventIn = trigger == Trigger.HOVER ? _this19.constructor.Event.MOUSEENTER : _this19.constructor.Event.FOCUSIN; - var eventOut = trigger == Trigger.HOVER ? _this19.constructor.Event.MOUSELEAVE : _this19.constructor.Event.FOCUSOUT; + var eventIn = trigger == Trigger.HOVER ? _this18.constructor.Event.MOUSEENTER : _this18.constructor.Event.FOCUSIN; + var eventOut = trigger == Trigger.HOVER ? _this18.constructor.Event.MOUSELEAVE : _this18.constructor.Event.FOCUSOUT; - $(_this19.element).on(eventIn, _this19.config.selector, $.proxy(_this19._enter, _this19)).on(eventOut, _this19.config.selector, $.proxy(_this19._leave, _this19)); + $(_this18.element).on(eventIn, _this18.config.selector, $.proxy(_this18._enter, _this18)).on(eventOut, _this18.config.selector, $.proxy(_this18._leave, _this18)); } }); @@ -3018,6 +3144,11 @@ var Tooltip = (function ($) { get: function () { return Event; } + }, { + key: 'EVENT_KEY', + get: function () { + return EVENT_KEY; + } }, { key: '_jQueryInterface', @@ -3081,6 +3212,7 @@ var Popover = (function ($) { var NAME = 'popover'; var VERSION = '4.0.0'; var DATA_KEY = 'bs.popover'; + var EVENT_KEY = '.' + DATA_KEY; var JQUERY_NO_CONFLICT = $.fn[NAME]; var Default = $.extend({}, Tooltip.Default, { @@ -3102,16 +3234,16 @@ var Popover = (function ($) { }; var Event = { - HIDE: 'hide.bs.popover', - HIDDEN: 'hidden.bs.popover', - SHOW: 'show.bs.popover', - SHOWN: 'shown.bs.popover', - INSERTED: 'inserted.bs.popover', - CLICK: 'click.bs.popover', - FOCUSIN: 'focusin.bs.popover', - FOCUSOUT: 'focusout.bs.popover', - MOUSEENTER: 'mouseenter.bs.popover', - MOUSELEAVE: 'mouseleave.bs.popover' + HIDE: 'hide' + EVENT_KEY, + HIDDEN: 'hidden' + EVENT_KEY, + SHOW: 'show' + EVENT_KEY, + SHOWN: 'shown' + EVENT_KEY, + INSERTED: 'inserted' + EVENT_KEY, + CLICK: 'click' + EVENT_KEY, + FOCUSIN: 'focusin' + EVENT_KEY, + FOCUSOUT: 'focusout' + EVENT_KEY, + MOUSEENTER: 'mouseenter' + EVENT_KEY, + MOUSELEAVE: 'mouseleave' + EVENT_KEY }; /** @@ -3199,6 +3331,11 @@ var Popover = (function ($) { get: function () { return Event; } + }, { + key: 'EVENT_KEY', + get: function () { + return EVENT_KEY; + } }, { key: '_jQueryInterface', diff --git a/dist/js/bootstrap.min.js b/dist/js/bootstrap.min.js index 6e54840af..49b050aa5 100644 --- a/dist/js/bootstrap.min.js +++ b/dist/js/bootstrap.min.js @@ -3,5 +3,5 @@ * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ -if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher")}(jQuery),+function(){"use strict";function a(a,b){if("function"!=typeof b&&null!==b)throw new TypeError("Super expression must either be null or a function, not "+typeof b);a.prototype=Object.create(b&&b.prototype,{constructor:{value:a,enumerable:!1,writable:!0,configurable:!0}}),b&&(a.__proto__=b)}function b(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}{var c=function(){function a(a,b){for(var c=0;cthis._items.length-1||0>b)){if(this._isSliding)return void a(this._element).one(l.SLID,function(){return c.to(b)});if(d==b)return this.pause(),void this.cycle();var e=b>d?k.NEXT:k.PREVIOUS;this._slide(e,this._items[b])}}},{key:"_addEventListeners",value:function(){this._config.keyboard&&a(this._element).on("keydown.bs.carousel",a.proxy(this._keydown,this)),"hover"!=this._config.pause||"ontouchstart"in document.documentElement||a(this._element).on("mouseenter.bs.carousel",a.proxy(this.pause,this)).on("mouseleave.bs.carousel",a.proxy(this.cycle,this))}},{key:"_keydown",value:function(a){if(a.preventDefault(),!/input|textarea/i.test(a.target.tagName))switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}}},{key:"_getItemIndex",value:function(b){return this._items=a.makeArray(a(b).parent().find(n.ITEM)),this._items.indexOf(b)}},{key:"_getItemByDirection",value:function(a,b){var c=a===k.NEXT,d=a===k.PREVIOUS,e=this._getItemIndex(b),f=this._items.length-1,g=d&&0===e||c&&e==f;if(g&&!this._config.wrap)return b;var h=a==k.PREVIOUS?-1:1,i=(e+h)%this._items.length;return-1===i?this._items[this._items.length-1]:this._items[i]}},{key:"_triggerSlideEvent",value:function(b,c){var d=a.Event(l.SLIDE,{relatedTarget:b,direction:c});return a(this._element).trigger(d),d}},{key:"_setActiveIndicatorElement",value:function(b){if(this._indicatorsElement){a(this._indicatorsElement).find(n.ACTIVE).removeClass(m.ACTIVE);var c=this._indicatorsElement.children[this._getItemIndex(b)];c&&a(c).addClass(m.ACTIVE)}}},{key:"_slide",value:function(b,c){var e=this,f=a(this._element).find(n.ACTIVE_ITEM)[0],g=c||f&&this._getItemByDirection(b,f),h=!!this._interval,j=b==k.NEXT?m.LEFT:m.RIGHT;if(g&&a(g).hasClass(m.ACTIVE))return void(this._isSliding=!1);var o=this._triggerSlideEvent(g,j);if(!o.isDefaultPrevented()&&f&&g){this._isSliding=!0,h&&this.pause(),this._setActiveIndicatorElement(g);var p=a.Event(l.SLID,{relatedTarget:g,direction:j});d.supportsTransitionEnd()&&a(this._element).hasClass(m.SLIDE)?(a(g).addClass(b),d.reflow(g),a(f).addClass(j),a(g).addClass(j),a(f).one(d.TRANSITION_END,function(){a(g).removeClass(j).removeClass(b),a(g).addClass(m.ACTIVE),a(f).removeClass(m.ACTIVE).removeClass(b).removeClass(j),e._isSliding=!1,setTimeout(function(){return a(e._element).trigger(p)},0)}).emulateTransitionEnd(i)):(a(f).removeClass(m.ACTIVE),a(g).addClass(m.ACTIVE),this._isSliding=!1,a(this._element).trigger(p)),h&&this.cycle()}}}],[{key:"VERSION",get:function(){return f}},{key:"Default",get:function(){return j}},{key:"_jQueryInterface",value:function(b){return this.each(function(){var c=a(this).data(g),d=a.extend({},j,a(this).data());"object"==typeof b&&a.extend(d,b);var f="string"==typeof b?b:d.slide;c||(c=new e(this,d),a(this).data(g,c)),"number"==typeof b?c.to(b):f?c[f]():d.interval&&(c.pause(),c.cycle())})}},{key:"_dataApiClickHandler",value:function(b){var c=d.getSelectorFromElement(this);if(c){var f=a(c)[0];if(f&&a(f).hasClass(m.CAROUSEL)){var h=a.extend({},a(f).data(),a(this).data()),i=this.getAttribute("data-slide-to");i&&(h.interval=!1),e._jQueryInterface.call(a(f),h),i&&a(f).data(g).to(i),b.preventDefault()}}}}]),e}();return a(document).on(l.CLICK,n.DATA_SLIDE,o._dataApiClickHandler),a(window).on(l.LOAD,function(){a(n.DATA_RIDE).each(function(){var b=a(this);o._jQueryInterface.call(b,b.data())})}),a.fn[e]=o._jQueryInterface,a.fn[e].Constructor=o,a.fn[e].noConflict=function(){return a.fn[e]=h,o._jQueryInterface},o}(jQuery),function(a){var e="collapse",f="4.0.0",g="bs.collapse",h=a.fn[e],i=600,j={toggle:!0,parent:null},k={SHOW:"show.bs.collapse",SHOWN:"shown.bs.collapse",HIDE:"hide.bs.collapse",HIDDEN:"hidden.bs.collapse",CLICK:"click.bs.collapse.data-api"},l={IN:"in",COLLAPSE:"collapse",COLLAPSING:"collapsing",COLLAPSED:"collapsed"},m={WIDTH:"width",HEIGHT:"height"},n={ACTIVES:".panel > .in, .panel > .collapsing",DATA_TOGGLE:'[data-toggle="collapse"]'},o=function(){function e(c,d){b(this,e),this._isTransitioning=!1,this._element=c,this._config=a.extend({},j,d),this._triggerArray=a.makeArray(a('[data-toggle="collapse"][href="#'+c.id+'"],'+('[data-toggle="collapse"][data-target="#'+c.id+'"]'))),this._parent=this._config.parent?this._getParent():null,this._config.parent||this._addAriaAndCollapsedClass(this._element,this._triggerArray),this._config.toggle&&this.toggle()}return c(e,[{key:"toggle",value:function(){a(this._element).hasClass(l.IN)?this.hide():this.show()}},{key:"show",value:function(){var b=this;if(!this._isTransitioning&&!a(this._element).hasClass(l.IN)){var c=void 0,f=void 0;if(this._parent&&(f=a.makeArray(a(n.ACTIVES)),f.length||(f=null)),!(f&&(c=a(f).data(g),c&&c._isTransitioning))){var h=a.Event(k.SHOW);if(a(this._element).trigger(h),!h.isDefaultPrevented()){f&&(e._jQueryInterface.call(a(f),"hide"),c||a(f).data(g,null));var j=this._getDimension();a(this._element).removeClass(l.COLLAPSE).addClass(l.COLLAPSING),this._element.style[j]=0,this._element.setAttribute("aria-expanded",!0),this._triggerArray.length&&a(this._triggerArray).removeClass(l.COLLAPSED).attr("aria-expanded",!0),this.setTransitioning(!0);var m=function(){a(b._element).removeClass(l.COLLAPSING).addClass(l.COLLAPSE).addClass(l.IN),b._element.style[j]="",b.setTransitioning(!1),a(b._element).trigger(k.SHOWN)};if(!d.supportsTransitionEnd())return void m();var o="scroll"+(j[0].toUpperCase()+j.slice(1));a(this._element).one(d.TRANSITION_END,m).emulateTransitionEnd(i),this._element.style[j]=this._element[o]+"px"}}}}},{key:"hide",value:function(){var b=this;if(!this._isTransitioning&&a(this._element).hasClass(l.IN)){var c=a.Event(k.HIDE);if(a(this._element).trigger(c),!c.isDefaultPrevented()){var e=this._getDimension(),f=e===m.WIDTH?"offsetWidth":"offsetHeight";this._element.style[e]=this._element[f]+"px",d.reflow(this._element),a(this._element).addClass(l.COLLAPSING).removeClass(l.COLLAPSE).removeClass(l.IN),this._element.setAttribute("aria-expanded",!1),this._triggerArray.length&&a(this._triggerArray).addClass(l.COLLAPSED).attr("aria-expanded",!1),this.setTransitioning(!0);var g=function(){b.setTransitioning(!1),a(b._element).removeClass(l.COLLAPSING).addClass(l.COLLAPSE).trigger(k.HIDDEN)};return this._element.style[e]=0,d.supportsTransitionEnd()?void a(this._element).one(d.TRANSITION_END,g).emulateTransitionEnd(i):g()}}}},{key:"setTransitioning",value:function(a){this._isTransitioning=a}},{key:"_getDimension",value:function(){var b=a(this._element).hasClass(m.WIDTH);return b?m.WIDTH:m.HEIGHT}},{key:"_getParent",value:function(){var b=this,c=a(this._config.parent)[0],d='[data-toggle="collapse"][data-parent="'+this._config.parent+'"]';return a(c).find(d).each(function(a,c){b._addAriaAndCollapsedClass(e._getTargetFromElement(c),[c])}),c}},{key:"_addAriaAndCollapsedClass",value:function(b,c){if(b){var d=a(b).hasClass(l.IN);b.setAttribute("aria-expanded",d),c.length&&a(c).toggleClass(l.COLLAPSED,!d).attr("aria-expanded",d)}}}],[{key:"VERSION",get:function(){return f}},{key:"Default",get:function(){return j}},{key:"_getTargetFromElement",value:function(b){var c=d.getSelectorFromElement(b);return c?a(c)[0]:null}},{key:"_jQueryInterface",value:function(b){return this.each(function(){var c=a(this),d=c.data(g),f=a.extend({},j,c.data(),"object"==typeof b&&b);!d&&f.toggle&&/show|hide/.test(b)&&(f.toggle=!1),d||(d=new e(this,f),c.data(g,d)),"string"==typeof b&&d[b]()})}}]),e}();return a(document).on(k.CLICK,n.DATA_TOGGLE,function(b){b.preventDefault();var c=o._getTargetFromElement(this),d=a(c).data(g),e=d?"toggle":a(this).data();o._jQueryInterface.call(a(c),e)}),a.fn[e]=o._jQueryInterface,a.fn[e].Constructor=o,a.fn[e].noConflict=function(){return a.fn[e]=h,o._jQueryInterface},o}(jQuery),function(a){var e="dropdown",f="4.0.0",g="bs.dropdown",h=a.fn[e],i={HIDE:"hide.bs.dropdown",HIDDEN:"hidden.bs.dropdown",SHOW:"show.bs.dropdown",SHOWN:"shown.bs.dropdown",CLICK:"click.bs.dropdown",KEYDOWN:"keydown.bs.dropdown.data-api",CLICK_DATA:"click.bs.dropdown.data-api"},j={BACKDROP:"dropdown-backdrop",DISABLED:"disabled",OPEN:"open"},k={BACKDROP:".dropdown-backdrop",DATA_TOGGLE:'[data-toggle="dropdown"]',FORM_CHILD:".dropdown form",ROLE_MENU:'[role="menu"]',ROLE_LISTBOX:'[role="listbox"]',NAVBAR_NAV:".navbar-nav",VISIBLE_ITEMS:'[role="menu"] li:not(.disabled) a, [role="listbox"] li:not(.disabled) a'},l=function(){function e(c){b(this,e),a(c).on(i.CLICK,this.toggle)}return c(e,[{key:"toggle",value:function(){if(!this.disabled&&!a(this).hasClass(j.DISABLED)){var b=e._getParentFromElement(this),c=a(b).hasClass(j.OPEN);if(e._clearMenus(),c)return!1;if("ontouchstart"in document.documentElement&&!a(b).closest(k.NAVBAR_NAV).length){var d=document.createElement("div");d.className=j.BACKDROP,a(d).insertBefore(this),a(d).on("click",e._clearMenus)}var f={relatedTarget:this},g=a.Event(i.SHOW,f);if(a(b).trigger(g),!g.isDefaultPrevented())return this.focus(),this.setAttribute("aria-expanded","true"),a(b).toggleClass(j.OPEN),a(b).trigger(i.SHOWN,f),!1}}}],[{key:"VERSION",get:function(){return f}},{key:"_jQueryInterface",value:function(b){return this.each(function(){var c=a(this).data(g);c||a(this).data(g,c=new e(this)),"string"==typeof b&&c[b].call(this)})}},{key:"_clearMenus",value:function(b){if(!b||3!==b.which){var c=a(k.BACKDROP)[0];c&&c.parentNode.removeChild(c);for(var d=a.makeArray(a(k.DATA_TOGGLE)),f=0;f0&&h--,40===b.which&&hdocument.documentElement.clientHeight;!this._isBodyOverflowing&&a&&(this._element.style.paddingLeft=this._scrollbarWidth+"px"),this._isBodyOverflowing&&!a&&(this._element.style.paddingRight=this._scrollbarWidth+"px")}},{key:"_resetAdjustments",value:function(){this._element.style.paddingLeft="",this._element.style.paddingRight=""}},{key:"_checkScrollbar",value:function(){var a=window.innerWidth;if(!a){var b=document.documentElement.getBoundingClientRect();a=b.right-Math.abs(b.left)}this._isBodyOverflowing=document.body.clientWidth a",this._offsets=[],this._targets=[],this._activeTarget=null,this._scrollHeight=0,a(this._scrollElement).on(j.SCROLL,a.proxy(this._process,this)),this.refresh(),this._process()}return c(e,[{key:"refresh",value:function(){var b=this,c="offset",e=0;this._scrollElement!==this._scrollElement.window&&(c="position",e=this._getScrollTop()),this._offsets=[],this._targets=[],this._scrollHeight=this._getScrollHeight();var f=a.makeArray(a(this._selector));f.map(function(b){var f=void 0,g=d.getSelectorFromElement(b);return g&&(f=a(g)[0]),f&&(f.offsetWidth||f.offsetHeight)?[a(f)[c]().top+e,g]:void 0}).filter(function(a){return a}).sort(function(a,b){return a[0]-b[0]}).forEach(function(a){b._offsets.push(a[0]),b._targets.push(a[1])})}},{key:"_getScrollTop",value:function(){return this._scrollElement===window?this._scrollElement.scrollY:this._scrollElement.scrollTop}},{key:"_getScrollHeight",value:function(){return this._scrollElement.scrollHeight||Math.max(document.body.scrollHeight,document.documentElement.scrollHeight)}},{key:"_process",value:function(){var a=this._getScrollTop()+this._config.offset,b=this._getScrollHeight(),c=this._config.offset+b-this._scrollElement.offsetHeight;if(this._scrollHeight!==b&&this.refresh(),a>=c){var d=this._targets[this._targets.length-1];this._activeTarget!==d&&this._activate(d)}if(this._activeTarget&&a=this._offsets[e]&&(void 0===this._offsets[e+1]||a .fade",ACTIVE:".active",ACTIVE_CHILD:"> .active",DATA_TOGGLE:'[data-toggle="tab"], [data-toggle="pill"]',DROPDOWN_ACTIVE_CHILD:"> .dropdown-menu > .active"},m=function(){function e(a){b(this,e),this._element=a}return c(e,[{key:"show",value:function(){var b=this;if(!this._element.parentNode||this._element.parentNode.nodeType!=Node.ELEMENT_NODE||!a(this._element).parent().hasClass(k.ACTIVE)){var c=void 0,e=void 0,f=a(this._element).closest(l.UL)[0],g=d.getSelectorFromElement(this._element);f&&(e=a.makeArray(a(f).find(l.ACTIVE)),e=e[e.length-1],e&&(e=a(e).find(l.A)[0]));var h=a.Event(j.HIDE,{relatedTarget:this._element}),i=a.Event(j.SHOW,{relatedTarget:e});if(e&&a(e).trigger(h),a(this._element).trigger(i),!i.isDefaultPrevented()&&!h.isDefaultPrevented()){g&&(c=a(g)[0]),this._activate(a(this._element).closest(l.LI)[0],f);var m=function(){var c=a.Event(j.HIDDEN,{relatedTarget:b._element}),d=a.Event(j.SHOWN,{relatedTarget:e});a(e).trigger(c),a(b._element).trigger(d)};c?this._activate(c,c.parentNode,m):m()}}}},{key:"_activate",value:function(b,c,e){var f=a(c).find(l.ACTIVE_CHILD)[0],g=e&&d.supportsTransitionEnd()&&(f&&a(f).hasClass(k.FADE)||!!a(c).find(l.FADE_CHILD)[0]),h=a.proxy(this._transitionComplete,this,b,f,g,e);f&&g?a(f).one(d.TRANSITION_END,h).emulateTransitionEnd(i):h(),f&&a(f).removeClass(k.IN)}},{key:"_transitionComplete",value:function(b,c,e,f){if(c){a(c).removeClass(k.ACTIVE);var g=a(c).find(l.DROPDOWN_ACTIVE_CHILD)[0];g&&a(g).removeClass(k.ACTIVE);var h=a(c).find(l.DATA_TOGGLE)[0];h&&h.setAttribute("aria-expanded",!1)}a(b).addClass(k.ACTIVE);var i=a(b).find(l.DATA_TOGGLE)[0];if(i&&i.setAttribute("aria-expanded",!0),e?(d.reflow(b),a(b).addClass(k.IN)):a(b).removeClass(k.FADE),b.parentNode&&a(b.parentNode).hasClass(k.DROPDOWN_MENU)){var j=a(b).closest(l.LI_DROPDOWN)[0];j&&a(j).addClass(k.ACTIVE),i=a(b).find(l.DATA_TOGGLE)[0],i&&i.setAttribute("aria-expanded",!0)}f&&f()}}],[{key:"VERSION",get:function(){return f}},{key:"Default",get:function(){return Default}},{key:"_jQueryInterface",value:function(b){return this.each(function(){var c=a(this),d=c.data(g);d||(d=d=new e(this),c.data(g,d)),"string"==typeof b&&d[b]()})}}]),e}();return a(document).on(j.CLICK,l.DATA_TOGGLE,function(b){b.preventDefault(),m._jQueryInterface.call(a(this),"show")}),a.fn[e]=m._jQueryInterface,a.fn[e].Constructor=m,a.fn[e].noConflict=function(){return a.fn[e]=h,m._jQueryInterface},m}(jQuery),function(a){var e="tooltip",f="4.0.0",g="bs.tooltip",h=a.fn[e],i=150,j="bs-tether",k={animation:!0,template:'',trigger:"hover focus",title:"",delay:0,html:!1,selector:!1,placement:"top",offset:"0 0",constraints:null},l={TOP:"bottom center",RIGHT:"middle left",BOTTOM:"top center",LEFT:"middle right"},m={IN:"in",OUT:"out"},n={HIDE:"hide.bs.tooltip",HIDDEN:"hidden.bs.tooltip",SHOW:"show.bs.tooltip",SHOWN:"shown.bs.tooltip",INSERTED:"inserted.bs.tooltip",CLICK:"click.bs.tooltip",FOCUSIN:"focusin.bs.tooltip",FOCUSOUT:"focusout.bs.tooltip",MOUSEENTER:"mouseenter.bs.tooltip",MOUSELEAVE:"mouseleave.bs.tooltip"},o={FADE:"fade",IN:"in"},p={TOOLTIP:".tooltip",TOOLTIP_INNER:".tooltip-inner"},q={element:!1,enabled:!1},r={HOVER:"hover",FOCUS:"focus",CLICK:"click",MANUAL:"manual"},s=function(){function h(a,c){b(this,h),this._isEnabled=!0,this._timeout=0,this._hoverState="",this._activeTrigger={},this._tether=null,this.element=a,this.config=this._getConfig(c),this.tip=null,this._setListeners()}return c(h,[{key:"enable",value:function(){this._isEnabled=!0}},{key:"disable",value:function(){this._isEnabled=!1}},{key:"toggleEnabled",value:function(){this._isEnabled=!this._isEnabled}},{key:"toggle",value:function(b){var c=this,d=this.constructor.DATA_KEY;b?(c=a(b.currentTarget).data(d),c||(c=new this.constructor(b.currentTarget,this._getDelegateConfig()),a(b.currentTarget).data(d,c)),c._activeTrigger.click=!c._activeTrigger.click,c._isWithActiveTrigger()?c._enter(null,c):c._leave(null,c)):a(c.getTipElement()).hasClass(o.IN)?c._leave(null,c):c._enter(null,c)}},{key:"destroy",value:function(){var b=this;clearTimeout(this._timeout),this.hide(function(){a(b.element).off("."+b.constructor.NAME).removeData(b.constructor.DATA_KEY), -b.tip&&a(b.tip).detach(),b.tip=null})}},{key:"show",value:function(){var b=this,c=a.Event(this.constructor.Event.SHOW);if(this.isWithContent()&&this._isEnabled){a(this.element).trigger(c);var e=a.contains(this.element.ownerDocument.documentElement,this.element);if(c.isDefaultPrevented()||!e)return;var f=this.getTipElement(),g=d.getUID(this.constructor.NAME);f.setAttribute("id",g),this.element.setAttribute("aria-describedby",g),this.setContent(),this.config.animation&&a(f).addClass(o.FADE);var i="function"==typeof this.config.placement?this.config.placement.call(this,f,this.element):this.config.placement,k=this._getAttachment(i);a(f).data(this.constructor.DATA_KEY,this).appendTo(document.body),a(this.element).trigger(this.constructor.Event.INSERTED),this._tether=new Tether({element:f,target:this.element,attachment:k,classes:q,classPrefix:j,offset:this.config.offset,constraints:this.config.constraints}),d.reflow(f),this._tether.position(),a(f).addClass(o.IN);var l=function(){var c=b._hoverState;b._hoverState=null,a(b.element).trigger(b.constructor.Event.SHOWN),c===m.OUT&&b._leave(null,b)};d.supportsTransitionEnd()&&a(this.tip).hasClass(o.FADE)?a(this.tip).one(d.TRANSITION_END,l).emulateTransitionEnd(h._TRANSITION_DURATION):l()}}},{key:"hide",value:function(b){var c=this,e=this.getTipElement(),f=a.Event(this.constructor.Event.HIDE),g=function(){c._hoverState!==m.IN&&e.parentNode&&e.parentNode.removeChild(e),c.element.removeAttribute("aria-describedby"),a(c.element).trigger(c.constructor.Event.HIDDEN),c.cleanupTether(),b&&b()};a(this.element).trigger(f),f.isDefaultPrevented()||(a(e).removeClass(o.IN),d.supportsTransitionEnd()&&a(this.tip).hasClass(o.FADE)?a(e).one(d.TRANSITION_END,g).emulateTransitionEnd(i):g(),this._hoverState="")}},{key:"isWithContent",value:function(){return!!this.getTitle()}},{key:"getTipElement",value:function(){return this.tip=this.tip||a(this.config.template)[0]}},{key:"setContent",value:function(){var b=this.getTipElement(),c=this.getTitle(),d=this.config.html?"innerHTML":"innerText";a(b).find(p.TOOLTIP_INNER)[0][d]=c,a(b).removeClass(o.FADE).removeClass(o.IN),this.cleanupTether()}},{key:"getTitle",value:function(){var a=this.element.getAttribute("data-original-title");return a||(a="function"==typeof this.config.title?this.config.title.call(this.element):this.config.title),a}},{key:"cleanupTether",value:function(){this._tether&&(this._tether.destroy(),a(this.element).removeClass(this._removeTetherClasses),a(this.tip).removeClass(this._removeTetherClasses))}},{key:"_getAttachment",value:function(a){return l[a.toUpperCase()]}},{key:"_setListeners",value:function(){var b=this,c=this.config.trigger.split(" ");c.forEach(function(c){if("click"===c)a(b.element).on(b.constructor.Event.CLICK,b.config.selector,a.proxy(b.toggle,b));else if(c!==r.MANUAL){var d=c==r.HOVER?b.constructor.Event.MOUSEENTER:b.constructor.Event.FOCUSIN,e=c==r.HOVER?b.constructor.Event.MOUSELEAVE:b.constructor.Event.FOCUSOUT;a(b.element).on(d,b.config.selector,a.proxy(b._enter,b)).on(e,b.config.selector,a.proxy(b._leave,b))}}),this.config.selector?this.config=a.extend({},this.config,{trigger:"manual",selector:""}):this._fixTitle()}},{key:"_removeTetherClasses",value:function(a,b){return((b.baseVal||b).match(new RegExp("(^|\\s)"+j+"-\\S+","g"))||[]).join(" ")}},{key:"_fixTitle",value:function(){var a=typeof this.element.getAttribute("data-original-title");(this.element.getAttribute("title")||"string"!==a)&&(this.element.setAttribute("data-original-title",this.element.getAttribute("title")||""),this.element.setAttribute("title",""))}},{key:"_enter",value:function(b,c){var d=this.constructor.DATA_KEY;return c=c||a(b.currentTarget).data(d),c||(c=new this.constructor(b.currentTarget,this._getDelegateConfig()),a(b.currentTarget).data(d,c)),b&&(c._activeTrigger["focusin"==b.type?r.FOCUS:r.HOVER]=!0),a(c.getTipElement()).hasClass(o.IN)||c._hoverState===m.IN?void(c._hoverState=m.IN):(clearTimeout(c._timeout),c._hoverState=m.IN,c.config.delay&&c.config.delay.show?void(c._timeout=setTimeout(function(){c._hoverState===m.IN&&c.show()},c.config.delay.show)):void c.show())}},{key:"_leave",value:function(b,c){var d=this.constructor.DATA_KEY;return c=c||a(b.currentTarget).data(d),c||(c=new this.constructor(b.currentTarget,this._getDelegateConfig()),a(b.currentTarget).data(d,c)),b&&(c._activeTrigger["focusout"==b.type?r.FOCUS:r.HOVER]=!1),c._isWithActiveTrigger()?void 0:(clearTimeout(c._timeout),c._hoverState=m.OUT,c.config.delay&&c.config.delay.hide?void(c._timeout=setTimeout(function(){c._hoverState===m.OUT&&c.hide()},c.config.delay.hide)):void c.hide())}},{key:"_isWithActiveTrigger",value:function(){for(var a in this._activeTrigger)if(this._activeTrigger[a])return!0;return!1}},{key:"_getConfig",value:function(b){return b=a.extend({},this.constructor.Default,a(this.element).data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b}},{key:"_getDelegateConfig",value:function(){var a={};if(this.config)for(var b in this.config){var c=this.config[b];this.constructor.Default[b]!==c&&(a[b]=c)}return a}}],[{key:"VERSION",get:function(){return f}},{key:"Default",get:function(){return k}},{key:"NAME",get:function(){return e}},{key:"DATA_KEY",get:function(){return g}},{key:"Event",get:function(){return n}},{key:"_jQueryInterface",value:function(b){return this.each(function(){var c=a(this).data(g),d="object"==typeof b?b:null;(c||!/destroy|hide/.test(b))&&(c||(c=new h(this,d),a(this).data(g,c)),"string"==typeof b&&c[b]())})}}]),h}();return a.fn[e]=s._jQueryInterface,a.fn[e].Constructor=s,a.fn[e].noConflict=function(){return a.fn[e]=h,s._jQueryInterface},s}(jQuery));!function(d){var f="popover",g="4.0.0",h="bs.popover",i=d.fn[f],j=d.extend({},e.Default,{placement:"right",trigger:"click",content:"",template:''}),k={FADE:"fade",IN:"in"},l={TITLE:".popover-title",CONTENT:".popover-content",ARROW:".popover-arrow"},m={HIDE:"hide.bs.popover",HIDDEN:"hidden.bs.popover",SHOW:"show.bs.popover",SHOWN:"shown.bs.popover",INSERTED:"inserted.bs.popover",CLICK:"click.bs.popover",FOCUSIN:"focusin.bs.popover",FOCUSOUT:"focusout.bs.popover",MOUSEENTER:"mouseenter.bs.popover",MOUSELEAVE:"mouseleave.bs.popover"},n=function(e){function i(){b(this,i),null!=e&&e.apply(this,arguments)}return a(i,e),c(i,[{key:"isWithContent",value:function(){return this.getTitle()||this._getContent()}},{key:"getTipElement",value:function(){return this.tip=this.tip||d(this.config.template)[0]}},{key:"setContent",value:function(){var a=this.getTipElement(),b=this.getTitle(),c=this._getContent(),e=d(a).find(l.TITLE)[0];e&&(e[this.config.html?"innerHTML":"innerText"]=b),d(a).find(l.CONTENT).children().detach().end()[this.config.html?"string"==typeof c?"html":"append":"text"](c),d(a).removeClass(k.FADE).removeClass(k.IN),this.cleanupTether()}},{key:"_getContent",value:function(){return this.element.getAttribute("data-content")||("function"==typeof this.config.content?this.config.content.call(this.element):this.config.content)}}],[{key:"VERSION",get:function(){return g}},{key:"Default",get:function(){return j}},{key:"NAME",get:function(){return f}},{key:"DATA_KEY",get:function(){return h}},{key:"Event",get:function(){return m}},{key:"_jQueryInterface",value:function(a){return this.each(function(){var b=d(this).data(h),c="object"==typeof a?a:null;(b||!/destroy|hide/.test(a))&&(b||(b=new i(this,c),d(this).data(h,b)),"string"==typeof a&&b[a]())})}}]),i}(e);return d.fn[f]=n._jQueryInterface,d.fn[f].Constructor=n,d.fn[f].noConflict=function(){return d.fn[f]=i,n._jQueryInterface},n}(jQuery)}}(jQuery); \ No newline at end of file +if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher")}(jQuery),+function(){"use strict";function a(a,b){if("function"!=typeof b&&null!==b)throw new TypeError("Super expression must either be null or a function, not "+typeof b);a.prototype=Object.create(b&&b.prototype,{constructor:{value:a,enumerable:!1,writable:!0,configurable:!0}}),b&&(a.__proto__=b)}function b(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}{var c=function(){function a(a,b){for(var c=0;cthis._items.length-1||0>b)){if(this._isSliding)return void a(this._element).one(n.SLID,function(){return c.to(b)});if(d==b)return this.pause(),void this.cycle();var e=b>d?m.NEXT:m.PREVIOUS;this._slide(e,this._items[b])}}},{key:"dispose",value:function(){a(this._element).off(h),a.removeData(this._element,g),this._items=null,this._config=null,this._element=null,this._interval=null,this._isPaused=null,this._isSliding=null,this._activeElement=null,this._indicatorsElement=null}},{key:"_addEventListeners",value:function(){this._config.keyboard&&a(this._element).on(n.KEYDOWN,a.proxy(this._keydown,this)),"hover"!=this._config.pause||"ontouchstart"in document.documentElement||a(this._element).on(n.MOUSEENTER,a.proxy(this.pause,this)).on(n.MOUSELEAVE,a.proxy(this.cycle,this))}},{key:"_keydown",value:function(a){if(a.preventDefault(),!/input|textarea/i.test(a.target.tagName))switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}}},{key:"_getItemIndex",value:function(b){return this._items=a.makeArray(a(b).parent().find(p.ITEM)),this._items.indexOf(b)}},{key:"_getItemByDirection",value:function(a,b){var c=a===m.NEXT,d=a===m.PREVIOUS,e=this._getItemIndex(b),f=this._items.length-1,g=d&&0===e||c&&e==f;if(g&&!this._config.wrap)return b;var h=a==m.PREVIOUS?-1:1,i=(e+h)%this._items.length;return-1===i?this._items[this._items.length-1]:this._items[i]}},{key:"_triggerSlideEvent",value:function(b,c){var d=a.Event(n.SLIDE,{relatedTarget:b,direction:c});return a(this._element).trigger(d),d}},{key:"_setActiveIndicatorElement",value:function(b){if(this._indicatorsElement){a(this._indicatorsElement).find(p.ACTIVE).removeClass(o.ACTIVE);var c=this._indicatorsElement.children[this._getItemIndex(b)];c&&a(c).addClass(o.ACTIVE)}}},{key:"_slide",value:function(b,c){var e=this,f=a(this._element).find(p.ACTIVE_ITEM)[0],g=c||f&&this._getItemByDirection(b,f),h=!!this._interval,i=b==m.NEXT?o.LEFT:o.RIGHT;if(g&&a(g).hasClass(o.ACTIVE))return void(this._isSliding=!1);var j=this._triggerSlideEvent(g,i);if(!j.isDefaultPrevented()&&f&&g){this._isSliding=!0,h&&this.pause(),this._setActiveIndicatorElement(g);var l=a.Event(n.SLID,{relatedTarget:g,direction:i});d.supportsTransitionEnd()&&a(this._element).hasClass(o.SLIDE)?(a(g).addClass(b),d.reflow(g),a(f).addClass(i),a(g).addClass(i),a(f).one(d.TRANSITION_END,function(){a(g).removeClass(i).removeClass(b),a(g).addClass(o.ACTIVE),a(f).removeClass(o.ACTIVE).removeClass(b).removeClass(i),e._isSliding=!1,setTimeout(function(){return a(e._element).trigger(l)},0)}).emulateTransitionEnd(k)):(a(f).removeClass(o.ACTIVE),a(g).addClass(o.ACTIVE),this._isSliding=!1,a(this._element).trigger(l)),h&&this.cycle()}}}],[{key:"VERSION",get:function(){return f}},{key:"Default",get:function(){return l}},{key:"_jQueryInterface",value:function(b){return this.each(function(){var c=a(this).data(g),d=a.extend({},l,a(this).data());"object"==typeof b&&a.extend(d,b);var f="string"==typeof b?b:d.slide;c||(c=new e(this,d),a(this).data(g,c)),"number"==typeof b?c.to(b):f?c[f]():d.interval&&(c.pause(),c.cycle())})}},{key:"_dataApiClickHandler",value:function(b){var c=d.getSelectorFromElement(this);if(c){var f=a(c)[0];if(f&&a(f).hasClass(o.CAROUSEL)){var h=a.extend({},a(f).data(),a(this).data()),i=this.getAttribute("data-slide-to");i&&(h.interval=!1),e._jQueryInterface.call(a(f),h),i&&a(f).data(g).to(i),b.preventDefault()}}}}]),e}();return a(document).on(n.CLICK_DATA_API,p.DATA_SLIDE,q._dataApiClickHandler),a(window).on(n.LOAD_DATA_API,function(){a(p.DATA_RIDE).each(function(){var b=a(this);q._jQueryInterface.call(b,b.data())})}),a.fn[e]=q._jQueryInterface,a.fn[e].Constructor=q,a.fn[e].noConflict=function(){return a.fn[e]=j,q._jQueryInterface},q}(jQuery),function(a){var e="collapse",f="4.0.0",g="bs.collapse",h="."+g,i=".data-api",j=a.fn[e],k=600,l={toggle:!0,parent:null},m={SHOW:"show"+h,SHOWN:"shown"+h,HIDE:"hide"+h,HIDDEN:"hidden"+h,CLICK_DATA_API:"click"+h+i},n={IN:"in",COLLAPSE:"collapse",COLLAPSING:"collapsing",COLLAPSED:"collapsed"},o={WIDTH:"width",HEIGHT:"height"},p={ACTIVES:".panel > .in, .panel > .collapsing",DATA_TOGGLE:'[data-toggle="collapse"]'},q=function(){function e(c,d){b(this,e),this._isTransitioning=!1,this._element=c,this._config=a.extend({},l,d),this._triggerArray=a.makeArray(a('[data-toggle="collapse"][href="#'+c.id+'"],'+('[data-toggle="collapse"][data-target="#'+c.id+'"]'))),this._parent=this._config.parent?this._getParent():null,this._config.parent||this._addAriaAndCollapsedClass(this._element,this._triggerArray),this._config.toggle&&this.toggle()}return c(e,[{key:"toggle",value:function(){a(this._element).hasClass(n.IN)?this.hide():this.show()}},{key:"show",value:function(){var b=this;if(!this._isTransitioning&&!a(this._element).hasClass(n.IN)){var c=void 0,f=void 0;if(this._parent&&(c=a.makeArray(a(p.ACTIVES)),c.length||(c=null)),!(c&&(f=a(c).data(g),f&&f._isTransitioning))){var h=a.Event(m.SHOW);if(a(this._element).trigger(h),!h.isDefaultPrevented()){c&&(e._jQueryInterface.call(a(c),"hide"),f||a(c).data(g,null));var i=this._getDimension();a(this._element).removeClass(n.COLLAPSE).addClass(n.COLLAPSING),this._element.style[i]=0,this._element.setAttribute("aria-expanded",!0),this._triggerArray.length&&a(this._triggerArray).removeClass(n.COLLAPSED).attr("aria-expanded",!0),this.setTransitioning(!0);var j=function(){a(b._element).removeClass(n.COLLAPSING).addClass(n.COLLAPSE).addClass(n.IN),b._element.style[i]="",b.setTransitioning(!1),a(b._element).trigger(m.SHOWN)};if(!d.supportsTransitionEnd())return void j();var l="scroll"+(i[0].toUpperCase()+i.slice(1));a(this._element).one(d.TRANSITION_END,j).emulateTransitionEnd(k),this._element.style[i]=this._element[l]+"px"}}}}},{key:"hide",value:function(){var b=this;if(!this._isTransitioning&&a(this._element).hasClass(n.IN)){var c=a.Event(m.HIDE);if(a(this._element).trigger(c),!c.isDefaultPrevented()){var e=this._getDimension(),f=e===o.WIDTH?"offsetWidth":"offsetHeight";this._element.style[e]=this._element[f]+"px",d.reflow(this._element),a(this._element).addClass(n.COLLAPSING).removeClass(n.COLLAPSE).removeClass(n.IN),this._element.setAttribute("aria-expanded",!1),this._triggerArray.length&&a(this._triggerArray).addClass(n.COLLAPSED).attr("aria-expanded",!1),this.setTransitioning(!0);var g=function(){b.setTransitioning(!1),a(b._element).removeClass(n.COLLAPSING).addClass(n.COLLAPSE).trigger(m.HIDDEN)};return this._element.style[e]=0,d.supportsTransitionEnd()?void a(this._element).one(d.TRANSITION_END,g).emulateTransitionEnd(k):g()}}}},{key:"setTransitioning",value:function(a){this._isTransitioning=a}},{key:"dispose",value:function(){a.removeData(this._element,g),this._config=null,this._parent=null,this._element=null,this._triggerArray=null,this._isTransitioning=null}},{key:"_getDimension",value:function(){var b=a(this._element).hasClass(o.WIDTH);return b?o.WIDTH:o.HEIGHT}},{key:"_getParent",value:function(){var b=this,c=a(this._config.parent)[0],d='[data-toggle="collapse"][data-parent="'+this._config.parent+'"]';return a(c).find(d).each(function(a,c){b._addAriaAndCollapsedClass(e._getTargetFromElement(c),[c])}),c}},{key:"_addAriaAndCollapsedClass",value:function(b,c){if(b){var d=a(b).hasClass(n.IN);b.setAttribute("aria-expanded",d),c.length&&a(c).toggleClass(n.COLLAPSED,!d).attr("aria-expanded",d)}}}],[{key:"VERSION",get:function(){return f}},{key:"Default",get:function(){return l}},{key:"_getTargetFromElement",value:function(b){var c=d.getSelectorFromElement(b);return c?a(c)[0]:null}},{key:"_jQueryInterface",value:function(b){return this.each(function(){var c=a(this),d=c.data(g),f=a.extend({},l,c.data(),"object"==typeof b&&b);!d&&f.toggle&&/show|hide/.test(b)&&(f.toggle=!1),d||(d=new e(this,f),c.data(g,d)),"string"==typeof b&&d[b]()})}}]),e}();return a(document).on(m.CLICK_DATA_API,p.DATA_TOGGLE,function(b){b.preventDefault();var c=q._getTargetFromElement(this),d=a(c).data(g),e=d?"toggle":a(this).data();q._jQueryInterface.call(a(c),e)}),a.fn[e]=q._jQueryInterface,a.fn[e].Constructor=q,a.fn[e].noConflict=function(){return a.fn[e]=j,q._jQueryInterface},q}(jQuery),function(a){var e="dropdown",f="4.0.0",g="bs.dropdown",h="."+g,i=".data-api",j=a.fn[e],k={HIDE:"hide"+h,HIDDEN:"hidden"+h,SHOW:"show"+h,SHOWN:"shown"+h,CLICK:"click"+h,CLICK_DATA_API:"click"+h+i,KEYDOWN_DATA_API:"keydown"+h+i},l={BACKDROP:"dropdown-backdrop",DISABLED:"disabled",OPEN:"open"},m={BACKDROP:".dropdown-backdrop",DATA_TOGGLE:'[data-toggle="dropdown"]',FORM_CHILD:".dropdown form",ROLE_MENU:'[role="menu"]',ROLE_LISTBOX:'[role="listbox"]',NAVBAR_NAV:".navbar-nav",VISIBLE_ITEMS:'[role="menu"] li:not(.disabled) a, [role="listbox"] li:not(.disabled) a'},n=function(){function e(a){b(this,e),this._element=a,this._addEventListeners()}return c(e,[{key:"toggle",value:function(){if(!this.disabled&&!a(this).hasClass(l.DISABLED)){var b=e._getParentFromElement(this),c=a(b).hasClass(l.OPEN);if(e._clearMenus(),c)return!1;if("ontouchstart"in document.documentElement&&!a(b).closest(m.NAVBAR_NAV).length){var d=document.createElement("div");d.className=l.BACKDROP,a(d).insertBefore(this),a(d).on("click",e._clearMenus)}var f={relatedTarget:this},g=a.Event(k.SHOW,f);if(a(b).trigger(g),!g.isDefaultPrevented())return this.focus(),this.setAttribute("aria-expanded","true"),a(b).toggleClass(l.OPEN),a(b).trigger(k.SHOWN,f),!1}}},{key:"dispose",value:function(){a.removeData(this._element,g),a(this._element).off(h),this._element=null}},{key:"_addEventListeners",value:function(){a(this._element).on(k.CLICK,this.toggle)}}],[{key:"VERSION",get:function(){return f}},{key:"_jQueryInterface",value:function(b){return this.each(function(){var c=a(this).data(g);c||a(this).data(g,c=new e(this)),"string"==typeof b&&c[b].call(this)})}},{key:"_clearMenus",value:function(b){if(!b||3!==b.which){var c=a(m.BACKDROP)[0];c&&c.parentNode.removeChild(c);for(var d=a.makeArray(a(m.DATA_TOGGLE)),f=0;f0&&h--,40===b.which&&hdocument.documentElement.clientHeight;!this._isBodyOverflowing&&a&&(this._element.style.paddingLeft=this._scrollbarWidth+"px"),this._isBodyOverflowing&&!a&&(this._element.style.paddingRight=this._scrollbarWidth+"px")}},{key:"_resetAdjustments",value:function(){this._element.style.paddingLeft="",this._element.style.paddingRight=""}},{key:"_checkScrollbar",value:function(){var a=window.innerWidth;if(!a){var b=document.documentElement.getBoundingClientRect();a=b.right-Math.abs(b.left)}this._isBodyOverflowing=document.body.clientWidth a",this._offsets=[],this._targets=[],this._activeTarget=null,this._scrollHeight=0,a(this._scrollElement).on(l.SCROLL,a.proxy(this._process,this)),this.refresh(),this._process()}return c(e,[{key:"refresh",value:function(){var b=this,c="offset",e=0;this._scrollElement!==this._scrollElement.window&&(c="position",e=this._getScrollTop()),this._offsets=[],this._targets=[],this._scrollHeight=this._getScrollHeight();var f=a.makeArray(a(this._selector));f.map(function(b){var f=void 0,g=d.getSelectorFromElement(b);return g&&(f=a(g)[0]),f&&(f.offsetWidth||f.offsetHeight)?[a(f)[c]().top+e,g]:void 0}).filter(function(a){return a}).sort(function(a,b){return a[0]-b[0]}).forEach(function(a){b._offsets.push(a[0]),b._targets.push(a[1])})}},{key:"dispose",value:function(){a.removeData(this._element,g),a(this._scrollElement).off(h),this._element=null,this._scrollElement=null,this._config=null,this._selector=null,this._offsets=null,this._targets=null,this._activeTarget=null,this._scrollHeight=null}},{key:"_getScrollTop",value:function(){return this._scrollElement===window?this._scrollElement.scrollY:this._scrollElement.scrollTop}},{key:"_getScrollHeight",value:function(){return this._scrollElement.scrollHeight||Math.max(document.body.scrollHeight,document.documentElement.scrollHeight)}},{key:"_process",value:function(){var a=this._getScrollTop()+this._config.offset,b=this._getScrollHeight(),c=this._config.offset+b-this._scrollElement.offsetHeight;if(this._scrollHeight!==b&&this.refresh(),a>=c){var d=this._targets[this._targets.length-1];this._activeTarget!==d&&this._activate(d)}if(this._activeTarget&&a=this._offsets[e]&&(void 0===this._offsets[e+1]||a .fade",ACTIVE:".active",ACTIVE_CHILD:"> .active",DATA_TOGGLE:'[data-toggle="tab"], [data-toggle="pill"]',DROPDOWN_ACTIVE_CHILD:"> .dropdown-menu > .active"},o=function(){function e(a){b(this,e),this._element=a}return c(e,[{key:"show",value:function(){var b=this;if(!this._element.parentNode||this._element.parentNode.nodeType!=Node.ELEMENT_NODE||!a(this._element).parent().hasClass(m.ACTIVE)){var c=void 0,e=void 0,f=a(this._element).closest(n.UL)[0],g=d.getSelectorFromElement(this._element);f&&(e=a.makeArray(a(f).find(n.ACTIVE)),e=e[e.length-1],e&&(e=a(e).find(n.A)[0]));var h=a.Event(l.HIDE,{relatedTarget:this._element}),i=a.Event(l.SHOW,{relatedTarget:e});if(e&&a(e).trigger(h),a(this._element).trigger(i),!i.isDefaultPrevented()&&!h.isDefaultPrevented()){g&&(c=a(g)[0]),this._activate(a(this._element).closest(n.LI)[0],f);var j=function(){var c=a.Event(l.HIDDEN,{relatedTarget:b._element}),d=a.Event(l.SHOWN,{relatedTarget:e});a(e).trigger(c),a(b._element).trigger(d)};c?this._activate(c,c.parentNode,j):j()}}}},{key:"dispose",value:function(){a.removeClass(this._element,g),this._element=null}},{key:"_activate",value:function(b,c,e){var f=a(c).find(n.ACTIVE_CHILD)[0],g=e&&d.supportsTransitionEnd()&&(f&&a(f).hasClass(m.FADE)||!!a(c).find(n.FADE_CHILD)[0]),h=a.proxy(this._transitionComplete,this,b,f,g,e);f&&g?a(f).one(d.TRANSITION_END,h).emulateTransitionEnd(k):h(),f&&a(f).removeClass(m.IN)}},{key:"_transitionComplete",value:function(b,c,e,f){if(c){a(c).removeClass(m.ACTIVE);var g=a(c).find(n.DROPDOWN_ACTIVE_CHILD)[0];g&&a(g).removeClass(m.ACTIVE);var h=a(c).find(n.DATA_TOGGLE)[0];h&&h.setAttribute("aria-expanded",!1)}a(b).addClass(m.ACTIVE);var i=a(b).find(n.DATA_TOGGLE)[0];if(i&&i.setAttribute("aria-expanded",!0),e?(d.reflow(b),a(b).addClass(m.IN)):a(b).removeClass(m.FADE),b.parentNode&&a(b.parentNode).hasClass(m.DROPDOWN_MENU)){var j=a(b).closest(n.LI_DROPDOWN)[0];j&&a(j).addClass(m.ACTIVE),i=a(b).find(n.DATA_TOGGLE)[0],i&&i.setAttribute("aria-expanded",!0)}f&&f()}}],[{key:"VERSION",get:function(){return f}},{key:"Default",get:function(){return Default}},{key:"_jQueryInterface",value:function(b){return this.each(function(){var c=a(this),d=c.data(g);d||(d=d=new e(this),c.data(g,d)),"string"==typeof b&&d[b]()})}}]),e}();return a(document).on(l.CLICK_DATA_API,n.DATA_TOGGLE,function(b){b.preventDefault(),o._jQueryInterface.call(a(this),"show")}),a.fn[e]=o._jQueryInterface,a.fn[e].Constructor=o,a.fn[e].noConflict=function(){return a.fn[e]=j,o._jQueryInterface},o}(jQuery),function(a){var e="tooltip",f="4.0.0",g="bs.tooltip",h="."+g,i=a.fn[e],j=150,k="bs-tether",l={animation:!0,template:'', +trigger:"hover focus",title:"",delay:0,html:!1,selector:!1,placement:"top",offset:"0 0",constraints:null},m={TOP:"bottom center",RIGHT:"middle left",BOTTOM:"top center",LEFT:"middle right"},n={IN:"in",OUT:"out"},o={HIDE:"hide"+h,HIDDEN:"hidden"+h,SHOW:"show"+h,SHOWN:"shown"+h,INSERTED:"inserted"+h,CLICK:"click"+h,FOCUSIN:"focusin"+h,FOCUSOUT:"focusout"+h,MOUSEENTER:"mouseenter"+h,MOUSELEAVE:"mouseleave"+h},p={FADE:"fade",IN:"in"},q={TOOLTIP:".tooltip",TOOLTIP_INNER:".tooltip-inner"},r={element:!1,enabled:!1},s={HOVER:"hover",FOCUS:"focus",CLICK:"click",MANUAL:"manual"},t=function(){function i(a,c){b(this,i),this._isEnabled=!0,this._timeout=0,this._hoverState="",this._activeTrigger={},this._tether=null,this.element=a,this.config=this._getConfig(c),this.tip=null,this._setListeners()}return c(i,[{key:"enable",value:function(){this._isEnabled=!0}},{key:"disable",value:function(){this._isEnabled=!1}},{key:"toggleEnabled",value:function(){this._isEnabled=!this._isEnabled}},{key:"toggle",value:function(b){var c=this,d=this.constructor.DATA_KEY;b?(c=a(b.currentTarget).data(d),c||(c=new this.constructor(b.currentTarget,this._getDelegateConfig()),a(b.currentTarget).data(d,c)),c._activeTrigger.click=!c._activeTrigger.click,c._isWithActiveTrigger()?c._enter(null,c):c._leave(null,c)):a(c.getTipElement()).hasClass(p.IN)?c._leave(null,c):c._enter(null,c)}},{key:"dispose",value:function(){clearTimeout(this._timeout),this.cleanupTether(),a.removeData(this.element,this.constructor.DATA_KEY),a(this.element).off(this.constructor.EVENT_KEY),this.tip&&a(this.tip).remove(),this._isEnabled=null,this._timeout=null,this._hoverState=null,this._activeTrigger=null,this._tether=null,this.element=null,this.config=null,this.tip=null}},{key:"show",value:function(){var b=this,c=a.Event(this.constructor.Event.SHOW);if(this.isWithContent()&&this._isEnabled){a(this.element).trigger(c);var e=a.contains(this.element.ownerDocument.documentElement,this.element);if(c.isDefaultPrevented()||!e)return;var f=this.getTipElement(),g=d.getUID(this.constructor.NAME);f.setAttribute("id",g),this.element.setAttribute("aria-describedby",g),this.setContent(),this.config.animation&&a(f).addClass(p.FADE);var h="function"==typeof this.config.placement?this.config.placement.call(this,f,this.element):this.config.placement,j=this._getAttachment(h);a(f).data(this.constructor.DATA_KEY,this).appendTo(document.body),a(this.element).trigger(this.constructor.Event.INSERTED),this._tether=new Tether({element:f,target:this.element,attachment:j,classes:r,classPrefix:k,offset:this.config.offset,constraints:this.config.constraints}),d.reflow(f),this._tether.position(),a(f).addClass(p.IN);var l=function(){var c=b._hoverState;b._hoverState=null,a(b.element).trigger(b.constructor.Event.SHOWN),c===n.OUT&&b._leave(null,b)};d.supportsTransitionEnd()&&a(this.tip).hasClass(p.FADE)?a(this.tip).one(d.TRANSITION_END,l).emulateTransitionEnd(i._TRANSITION_DURATION):l()}}},{key:"hide",value:function(b){var c=this,e=this.getTipElement(),f=a.Event(this.constructor.Event.HIDE),g=function(){c._hoverState!==n.IN&&e.parentNode&&e.parentNode.removeChild(e),c.element.removeAttribute("aria-describedby"),a(c.element).trigger(c.constructor.Event.HIDDEN),c.cleanupTether(),b&&b()};a(this.element).trigger(f),f.isDefaultPrevented()||(a(e).removeClass(p.IN),d.supportsTransitionEnd()&&a(this.tip).hasClass(p.FADE)?a(e).one(d.TRANSITION_END,g).emulateTransitionEnd(j):g(),this._hoverState="")}},{key:"isWithContent",value:function(){return!!this.getTitle()}},{key:"getTipElement",value:function(){return this.tip=this.tip||a(this.config.template)[0]}},{key:"setContent",value:function(){var b=this.getTipElement(),c=this.getTitle(),d=this.config.html?"innerHTML":"innerText";a(b).find(q.TOOLTIP_INNER)[0][d]=c,a(b).removeClass(p.FADE).removeClass(p.IN),this.cleanupTether()}},{key:"getTitle",value:function(){var a=this.element.getAttribute("data-original-title");return a||(a="function"==typeof this.config.title?this.config.title.call(this.element):this.config.title),a}},{key:"cleanupTether",value:function(){this._tether&&(this._tether.destroy(),a(this.element).removeClass(this._removeTetherClasses),a(this.tip).removeClass(this._removeTetherClasses))}},{key:"_getAttachment",value:function(a){return m[a.toUpperCase()]}},{key:"_setListeners",value:function(){var b=this,c=this.config.trigger.split(" ");c.forEach(function(c){if("click"===c)a(b.element).on(b.constructor.Event.CLICK,b.config.selector,a.proxy(b.toggle,b));else if(c!==s.MANUAL){var d=c==s.HOVER?b.constructor.Event.MOUSEENTER:b.constructor.Event.FOCUSIN,e=c==s.HOVER?b.constructor.Event.MOUSELEAVE:b.constructor.Event.FOCUSOUT;a(b.element).on(d,b.config.selector,a.proxy(b._enter,b)).on(e,b.config.selector,a.proxy(b._leave,b))}}),this.config.selector?this.config=a.extend({},this.config,{trigger:"manual",selector:""}):this._fixTitle()}},{key:"_removeTetherClasses",value:function(a,b){return((b.baseVal||b).match(new RegExp("(^|\\s)"+k+"-\\S+","g"))||[]).join(" ")}},{key:"_fixTitle",value:function(){var a=typeof this.element.getAttribute("data-original-title");(this.element.getAttribute("title")||"string"!==a)&&(this.element.setAttribute("data-original-title",this.element.getAttribute("title")||""),this.element.setAttribute("title",""))}},{key:"_enter",value:function(b,c){var d=this.constructor.DATA_KEY;return c=c||a(b.currentTarget).data(d),c||(c=new this.constructor(b.currentTarget,this._getDelegateConfig()),a(b.currentTarget).data(d,c)),b&&(c._activeTrigger["focusin"==b.type?s.FOCUS:s.HOVER]=!0),a(c.getTipElement()).hasClass(p.IN)||c._hoverState===n.IN?void(c._hoverState=n.IN):(clearTimeout(c._timeout),c._hoverState=n.IN,c.config.delay&&c.config.delay.show?void(c._timeout=setTimeout(function(){c._hoverState===n.IN&&c.show()},c.config.delay.show)):void c.show())}},{key:"_leave",value:function(b,c){var d=this.constructor.DATA_KEY;return c=c||a(b.currentTarget).data(d),c||(c=new this.constructor(b.currentTarget,this._getDelegateConfig()),a(b.currentTarget).data(d,c)),b&&(c._activeTrigger["focusout"==b.type?s.FOCUS:s.HOVER]=!1),c._isWithActiveTrigger()?void 0:(clearTimeout(c._timeout),c._hoverState=n.OUT,c.config.delay&&c.config.delay.hide?void(c._timeout=setTimeout(function(){c._hoverState===n.OUT&&c.hide()},c.config.delay.hide)):void c.hide())}},{key:"_isWithActiveTrigger",value:function(){for(var a in this._activeTrigger)if(this._activeTrigger[a])return!0;return!1}},{key:"_getConfig",value:function(b){return b=a.extend({},this.constructor.Default,a(this.element).data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b}},{key:"_getDelegateConfig",value:function(){var a={};if(this.config)for(var b in this.config){var c=this.config[b];this.constructor.Default[b]!==c&&(a[b]=c)}return a}}],[{key:"VERSION",get:function(){return f}},{key:"Default",get:function(){return l}},{key:"NAME",get:function(){return e}},{key:"DATA_KEY",get:function(){return g}},{key:"Event",get:function(){return o}},{key:"EVENT_KEY",get:function(){return h}},{key:"_jQueryInterface",value:function(b){return this.each(function(){var c=a(this).data(g),d="object"==typeof b?b:null;(c||!/destroy|hide/.test(b))&&(c||(c=new i(this,d),a(this).data(g,c)),"string"==typeof b&&c[b]())})}}]),i}();return a.fn[e]=t._jQueryInterface,a.fn[e].Constructor=t,a.fn[e].noConflict=function(){return a.fn[e]=i,t._jQueryInterface},t}(jQuery));!function(d){var f="popover",g="4.0.0",h="bs.popover",i="."+h,j=d.fn[f],k=d.extend({},e.Default,{placement:"right",trigger:"click",content:"",template:''}),l={FADE:"fade",IN:"in"},m={TITLE:".popover-title",CONTENT:".popover-content",ARROW:".popover-arrow"},n={HIDE:"hide"+i,HIDDEN:"hidden"+i,SHOW:"show"+i,SHOWN:"shown"+i,INSERTED:"inserted"+i,CLICK:"click"+i,FOCUSIN:"focusin"+i,FOCUSOUT:"focusout"+i,MOUSEENTER:"mouseenter"+i,MOUSELEAVE:"mouseleave"+i},o=function(e){function j(){b(this,j),null!=e&&e.apply(this,arguments)}return a(j,e),c(j,[{key:"isWithContent",value:function(){return this.getTitle()||this._getContent()}},{key:"getTipElement",value:function(){return this.tip=this.tip||d(this.config.template)[0]}},{key:"setContent",value:function(){var a=this.getTipElement(),b=this.getTitle(),c=this._getContent(),e=d(a).find(m.TITLE)[0];e&&(e[this.config.html?"innerHTML":"innerText"]=b),d(a).find(m.CONTENT).children().detach().end()[this.config.html?"string"==typeof c?"html":"append":"text"](c),d(a).removeClass(l.FADE).removeClass(l.IN),this.cleanupTether()}},{key:"_getContent",value:function(){return this.element.getAttribute("data-content")||("function"==typeof this.config.content?this.config.content.call(this.element):this.config.content)}}],[{key:"VERSION",get:function(){return g}},{key:"Default",get:function(){return k}},{key:"NAME",get:function(){return f}},{key:"DATA_KEY",get:function(){return h}},{key:"Event",get:function(){return n}},{key:"EVENT_KEY",get:function(){return i}},{key:"_jQueryInterface",value:function(a){return this.each(function(){var b=d(this).data(h),c="object"==typeof a?a:null;(b||!/destroy|hide/.test(a))&&(b||(b=new j(this,c),d(this).data(h,b)),"string"==typeof a&&b[a]())})}}]),j}(e);return d.fn[f]=o._jQueryInterface,d.fn[f].Constructor=o,d.fn[f].noConflict=function(){return d.fn[f]=j,o._jQueryInterface},o}(jQuery)}}(jQuery); \ No newline at end of file diff --git a/dist/js/umd/alert.js b/dist/js/umd/alert.js index 1d01fb7a3..eae17ceb6 100644 --- a/dist/js/umd/alert.js +++ b/dist/js/umd/alert.js @@ -39,6 +39,8 @@ var NAME = 'alert'; var VERSION = '4.0.0'; var DATA_KEY = 'bs.alert'; + var EVENT_KEY = '.' + DATA_KEY; + var DATA_API_KEY = '.data-api'; var JQUERY_NO_CONFLICT = $.fn[NAME]; var TRANSITION_DURATION = 150; @@ -47,9 +49,9 @@ }; var Event = { - CLOSE: 'close.bs.alert', - CLOSED: 'closed.bs.alert', - CLICK: 'click.bs.alert.data-api' + CLOSE: 'close' + EVENT_KEY, + CLOSED: 'closed' + EVENT_KEY, + CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY }; var ClassName = { @@ -88,6 +90,12 @@ this._removeElement(rootElement); } + }, { + key: 'dispose', + value: function dispose() { + $.removeData(this._element, DATA_KEY); + this._element = null; + } }, { key: '_getRootElement', @@ -181,7 +189,7 @@ * ------------------------------------------------------------------------ */ - $(document).on(Event.CLICK, Selector.DISMISS, Alert._handleDismiss(new Alert())); + $(document).on(Event.CLICK_DATA_API, Selector.DISMISS, Alert._handleDismiss(new Alert())); /** * ------------------------------------------------------------------------ diff --git a/dist/js/umd/button.js b/dist/js/umd/button.js index 7449af2c9..730b3ef01 100644 --- a/dist/js/umd/button.js +++ b/dist/js/umd/button.js @@ -35,6 +35,8 @@ var NAME = 'button'; var VERSION = '4.0.0'; var DATA_KEY = 'bs.button'; + var EVENT_KEY = '.' + DATA_KEY; + var DATA_API_KEY = '.data-api'; var JQUERY_NO_CONFLICT = $.fn[NAME]; var TRANSITION_DURATION = 150; @@ -53,8 +55,8 @@ }; var Event = { - CLICK: 'click.bs.button.data-api', - FOCUS_BLUR: 'focus.bs.button.data-api blur.bs.button.data-api' + CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY, + FOCUS_BLUR_DATA_API: 'focus' + EVENT_KEY + '' + DATA_API_KEY + ' ' + ('blur' + EVENT_KEY + '' + DATA_API_KEY) }; /** @@ -108,6 +110,12 @@ $(this._element).toggleClass(ClassName.ACTIVE); } } + }, { + key: 'dispose', + value: function dispose() { + $.removeData(this._element, DATA_KEY); + this._element = null; + } }], [{ key: 'VERSION', @@ -146,7 +154,7 @@ * ------------------------------------------------------------------------ */ - $(document).on(Event.CLICK, Selector.DATA_TOGGLE_CARROT, function (event) { + $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE_CARROT, function (event) { event.preventDefault(); var button = event.target; @@ -156,7 +164,7 @@ } Button._jQueryInterface.call($(button), 'toggle'); - }).on(Event.FOCUS_BLUR, Selector.DATA_TOGGLE_CARROT, function (event) { + }).on(Event.FOCUS_BLUR_DATA_API, Selector.DATA_TOGGLE_CARROT, function (event) { var button = $(event.target).closest(Selector.BUTTON)[0]; $(button).toggleClass(ClassName.FOCUS, /^focus(in)?$/.test(event.type)); }); diff --git a/dist/js/umd/carousel.js b/dist/js/umd/carousel.js index 0e5b34142..a2faa92f0 100644 --- a/dist/js/umd/carousel.js +++ b/dist/js/umd/carousel.js @@ -39,6 +39,8 @@ var NAME = 'carousel'; var VERSION = '4.0.0'; 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; @@ -56,10 +58,13 @@ }; var Event = { - SLIDE: 'slide.bs.carousel', - SLID: 'slid.bs.carousel', - CLICK: 'click.bs.carousel.data-api', - LOAD: 'load' + SLIDE: 'slide' + EVENT_KEY, + SLID: 'slid' + EVENT_KEY, + KEYDOWN: 'keydown' + EVENT_KEY, + MOUSEENTER: 'mouseenter' + EVENT_KEY, + MOUSELEAVE: 'mouseleave' + EVENT_KEY, + LOAD_DATA_API: 'load' + EVENT_KEY + '' + DATA_API_KEY, + CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY }; var ClassName = { @@ -183,6 +188,21 @@ this._slide(direction, this._items[index]); } + }, { + key: 'dispose', + value: function dispose() { + $(this._element).off(EVENT_KEY); + $.removeData(this._element, DATA_KEY); + + this._items = null; + this._config = null; + this._element = null; + this._interval = null; + this._isPaused = null; + this._isSliding = null; + this._activeElement = null; + this._indicatorsElement = null; + } }, { key: '_addEventListeners', @@ -190,11 +210,11 @@ value: function _addEventListeners() { if (this._config.keyboard) { - $(this._element).on('keydown.bs.carousel', $.proxy(this._keydown, this)); + $(this._element).on(Event.KEYDOWN, $.proxy(this._keydown, this)); } if (this._config.pause == 'hover' && !('ontouchstart' in document.documentElement)) { - $(this._element).on('mouseenter.bs.carousel', $.proxy(this.pause, this)).on('mouseleave.bs.carousel', $.proxy(this.cycle, this)); + $(this._element).on(Event.MOUSEENTER, $.proxy(this.pause, this)).on(Event.MOUSELEAVE, $.proxy(this.cycle, this)); } } }, { @@ -421,9 +441,9 @@ * ------------------------------------------------------------------------ */ - $(document).on(Event.CLICK, Selector.DATA_SLIDE, Carousel._dataApiClickHandler); + $(document).on(Event.CLICK_DATA_API, Selector.DATA_SLIDE, Carousel._dataApiClickHandler); - $(window).on(Event.LOAD, function () { + $(window).on(Event.LOAD_DATA_API, function () { $(Selector.DATA_RIDE).each(function () { var $carousel = $(this); Carousel._jQueryInterface.call($carousel, $carousel.data()); diff --git a/dist/js/umd/collapse.js b/dist/js/umd/collapse.js index 5a931a9b4..23784388e 100644 --- a/dist/js/umd/collapse.js +++ b/dist/js/umd/collapse.js @@ -39,6 +39,8 @@ var NAME = 'collapse'; var VERSION = '4.0.0'; var DATA_KEY = 'bs.collapse'; + var EVENT_KEY = '.' + DATA_KEY; + var DATA_API_KEY = '.data-api'; var JQUERY_NO_CONFLICT = $.fn[NAME]; var TRANSITION_DURATION = 600; @@ -48,11 +50,11 @@ }; var Event = { - SHOW: 'show.bs.collapse', - SHOWN: 'shown.bs.collapse', - HIDE: 'hide.bs.collapse', - HIDDEN: 'hidden.bs.collapse', - CLICK: 'click.bs.collapse.data-api' + SHOW: 'show' + EVENT_KEY, + SHOWN: 'shown' + EVENT_KEY, + HIDE: 'hide' + EVENT_KEY, + HIDDEN: 'hidden' + EVENT_KEY, + CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY }; var ClassName = { @@ -119,8 +121,8 @@ return; } - var activesData = undefined; var actives = undefined; + var activesData = undefined; if (this._parent) { actives = $.makeArray($(Selector.ACTIVES)); @@ -233,6 +235,17 @@ value: function setTransitioning(isTransitioning) { this._isTransitioning = isTransitioning; } + }, { + key: 'dispose', + value: function dispose() { + $.removeData(this._element, DATA_KEY); + + this._config = null; + this._parent = null; + this._element = null; + this._triggerArray = null; + this._isTransitioning = null; + } }, { key: '_getDimension', @@ -323,7 +336,7 @@ * ------------------------------------------------------------------------ */ - $(document).on(Event.CLICK, Selector.DATA_TOGGLE, function (event) { + $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { event.preventDefault(); var target = Collapse._getTargetFromElement(this); diff --git a/dist/js/umd/dropdown.js b/dist/js/umd/dropdown.js index 05cbe99a9..86ac7500d 100644 --- a/dist/js/umd/dropdown.js +++ b/dist/js/umd/dropdown.js @@ -39,16 +39,18 @@ var NAME = 'dropdown'; var VERSION = '4.0.0'; var DATA_KEY = 'bs.dropdown'; + var EVENT_KEY = '.' + DATA_KEY; + var DATA_API_KEY = '.data-api'; var JQUERY_NO_CONFLICT = $.fn[NAME]; var Event = { - HIDE: 'hide.bs.dropdown', - HIDDEN: 'hidden.bs.dropdown', - SHOW: 'show.bs.dropdown', - SHOWN: 'shown.bs.dropdown', - CLICK: 'click.bs.dropdown', - KEYDOWN: 'keydown.bs.dropdown.data-api', - CLICK_DATA: 'click.bs.dropdown.data-api' + HIDE: 'hide' + EVENT_KEY, + HIDDEN: 'hidden' + EVENT_KEY, + SHOW: 'show' + EVENT_KEY, + SHOWN: 'shown' + EVENT_KEY, + CLICK: 'click' + EVENT_KEY, + CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY, + KEYDOWN_DATA_API: 'keydown' + EVENT_KEY + '' + DATA_API_KEY }; var ClassName = { @@ -77,7 +79,9 @@ function Dropdown(element) { _classCallCheck(this, Dropdown); - $(element).on(Event.CLICK, this.toggle); + this._element = element; + + this._addEventListeners(); } _createClass(Dropdown, [{ @@ -125,6 +129,21 @@ return false; } + }, { + key: 'dispose', + value: function dispose() { + $.removeData(this._element, DATA_KEY); + $(this._element).off(EVENT_KEY); + this._element = null; + } + }, { + key: '_addEventListeners', + + // private + + value: function _addEventListeners() { + $(this._element).on(Event.CLICK, this.toggle); + } }], [{ key: 'VERSION', @@ -257,7 +276,7 @@ * ------------------------------------------------------------------------ */ - $(document).on(Event.KEYDOWN, Selector.DATA_TOGGLE, Dropdown._dataApiKeydownHandler).on(Event.KEYDOWN, Selector.ROLE_MENU, Dropdown._dataApiKeydownHandler).on(Event.KEYDOWN, Selector.ROLE_LISTBOX, Dropdown._dataApiKeydownHandler).on(Event.CLICK_DATA, Dropdown._clearMenus).on(Event.CLICK_DATA, Selector.DATA_TOGGLE, Dropdown.prototype.toggle).on(Event.CLICK_DATA, Selector.FORM_CHILD, function (e) { + $(document).on(Event.KEYDOWN_DATA_API, Selector.DATA_TOGGLE, Dropdown._dataApiKeydownHandler).on(Event.KEYDOWN_DATA_API, Selector.ROLE_MENU, Dropdown._dataApiKeydownHandler).on(Event.KEYDOWN_DATA_API, Selector.ROLE_LISTBOX, Dropdown._dataApiKeydownHandler).on(Event.CLICK_DATA_API, Dropdown._clearMenus).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, Dropdown.prototype.toggle).on(Event.CLICK_DATA_API, Selector.FORM_CHILD, function (e) { e.stopPropagation(); }); diff --git a/dist/js/umd/modal.js b/dist/js/umd/modal.js index 440985577..ca518198c 100644 --- a/dist/js/umd/modal.js +++ b/dist/js/umd/modal.js @@ -39,6 +39,8 @@ var NAME = 'modal'; var VERSION = '4.0.0'; 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; @@ -50,17 +52,17 @@ }; var Event = { - HIDE: 'hide.bs.modal', - HIDDEN: 'hidden.bs.modal', - SHOW: 'show.bs.modal', - SHOWN: 'shown.bs.modal', - DISMISS: 'click.dismiss.bs.modal', - KEYDOWN: 'keydown.dismiss.bs.modal', - FOCUSIN: 'focusin.bs.modal', - RESIZE: 'resize.bs.modal', - CLICK: 'click.bs.modal.data-api', - MOUSEDOWN: 'mousedown.dismiss.bs.modal', - MOUSEUP: 'mouseup.dismiss.bs.modal' + HIDE: 'hide' + EVENT_KEY, + HIDDEN: 'hidden' + EVENT_KEY, + SHOW: 'show' + EVENT_KEY, + SHOWN: 'shown' + EVENT_KEY, + FOCUSIN: 'focusin' + EVENT_KEY, + RESIZE: 'resize' + EVENT_KEY, + CLICK_DISMISS: 'click.dismiss' + EVENT_KEY, + KEYDOWN_DISMISS: 'keydown.dismiss' + EVENT_KEY, + MOUSEUP_DISMISS: 'mouseup.dismiss' + EVENT_KEY, + MOUSEDOWN_DISMISS: 'mousedown.dismiss' + EVENT_KEY, + CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY }; var ClassName = { @@ -131,10 +133,10 @@ this._setEscapeEvent(); this._setResizeEvent(); - $(this._element).on(Event.DISMISS, Selector.DATA_DISMISS, $.proxy(this.hide, this)); + $(this._element).on(Event.CLICK_DISMISS, Selector.DATA_DISMISS, $.proxy(this.hide, this)); - $(this._dialog).on(Event.MOUSEDOWN, function () { - $(_this._element).one(Event.MOUSEUP, function (event) { + $(this._dialog).on(Event.MOUSEDOWN_DISMISS, function () { + $(_this._element).one(Event.MOUSEUP_DISMISS, function (event) { if ($(event.target).is(_this._element)) { that._ignoreBackdropClick = true; } @@ -167,8 +169,8 @@ $(this._element).removeClass(ClassName.IN); - $(this._element).off(Event.DISMISS); - $(this._dialog).off(Event.MOUSEDOWN); + $(this._element).off(Event.CLICK_DISMISS); + $(this._dialog).off(Event.MOUSEDOWN_DISMISS); if (_Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.FADE)) { @@ -177,6 +179,26 @@ this._hideModal(); } } + }, { + key: 'dispose', + value: function dispose() { + $.removeData(this._element, DATA_KEY); + + $(window).off(EVENT_KEY); + $(document).off(EVENT_KEY); + $(this._element).off(EVENT_KEY); + $(this._backdrop).off(EVENT_KEY); + + this._config = null; + this._element = null; + this._dialog = null; + this._backdrop = null; + this._isShown = null; + this._isBodyOverflowing = null; + this._ignoreBackdropClick = null; + this._originalBodyPadding = null; + this._scrollbarWidth = null; + } }, { key: '_showElement', @@ -236,13 +258,13 @@ var _this4 = this; if (this._isShown && this._config.keyboard) { - $(this._element).on(Event.KEYDOWN, function (event) { + $(this._element).on(Event.KEYDOWN_DISMISS, function (event) { if (event.which === 27) { _this4.hide(); } }); } else if (!this._isShown) { - $(this._element).off(Event.KEYDOWN); + $(this._element).off(Event.KEYDOWN_DISMISS); } } }, { @@ -294,7 +316,7 @@ $(this._backdrop).appendTo(this.$body); - $(this._element).on(Event.DISMISS, function (event) { + $(this._element).on(Event.CLICK_DISMISS, function (event) { if (_this6._ignoreBackdropClick) { _this6._ignoreBackdropClick = false; return; @@ -459,7 +481,7 @@ * ------------------------------------------------------------------------ */ - $(document).on(Event.CLICK, Selector.DATA_TOGGLE, function (event) { + $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { var _this7 = this; var target = undefined; diff --git a/dist/js/umd/popover.js b/dist/js/umd/popover.js index f13371b87..fa03c8229 100644 --- a/dist/js/umd/popover.js +++ b/dist/js/umd/popover.js @@ -41,6 +41,7 @@ var NAME = 'popover'; var VERSION = '4.0.0'; var DATA_KEY = 'bs.popover'; + var EVENT_KEY = '.' + DATA_KEY; var JQUERY_NO_CONFLICT = $.fn[NAME]; var Default = $.extend({}, _Tooltip2.Default, { @@ -62,16 +63,16 @@ }; var Event = { - HIDE: 'hide.bs.popover', - HIDDEN: 'hidden.bs.popover', - SHOW: 'show.bs.popover', - SHOWN: 'shown.bs.popover', - INSERTED: 'inserted.bs.popover', - CLICK: 'click.bs.popover', - FOCUSIN: 'focusin.bs.popover', - FOCUSOUT: 'focusout.bs.popover', - MOUSEENTER: 'mouseenter.bs.popover', - MOUSELEAVE: 'mouseleave.bs.popover' + HIDE: 'hide' + EVENT_KEY, + HIDDEN: 'hidden' + EVENT_KEY, + SHOW: 'show' + EVENT_KEY, + SHOWN: 'shown' + EVENT_KEY, + INSERTED: 'inserted' + EVENT_KEY, + CLICK: 'click' + EVENT_KEY, + FOCUSIN: 'focusin' + EVENT_KEY, + FOCUSOUT: 'focusout' + EVENT_KEY, + MOUSEENTER: 'mouseenter' + EVENT_KEY, + MOUSELEAVE: 'mouseleave' + EVENT_KEY }; /** @@ -159,6 +160,11 @@ get: function () { return Event; } + }, { + key: 'EVENT_KEY', + get: function () { + return EVENT_KEY; + } }, { key: '_jQueryInterface', diff --git a/dist/js/umd/scrollspy.js b/dist/js/umd/scrollspy.js index 63cbae574..d83153caa 100644 --- a/dist/js/umd/scrollspy.js +++ b/dist/js/umd/scrollspy.js @@ -39,6 +39,8 @@ var NAME = 'scrollspy'; var VERSION = '4.0.0'; var DATA_KEY = 'bs.scrollspy'; + var EVENT_KEY = '.' + DATA_KEY; + var DATA_API_KEY = '.data-api'; var JQUERY_NO_CONFLICT = $.fn[NAME]; var Default = { @@ -46,9 +48,9 @@ }; var Event = { - ACTIVATE: 'activate.bs.scrollspy', - SCROLL: 'scroll.bs.scrollspy', - LOAD: 'load.bs.scrollspy.data-api' + ACTIVATE: 'activate' + EVENT_KEY, + SCROLL: 'scroll' + EVENT_KEY, + LOAD_DATA_API: 'load' + EVENT_KEY + '' + DATA_API_KEY }; var ClassName = { @@ -73,6 +75,7 @@ function ScrollSpy(element, config) { _classCallCheck(this, ScrollSpy); + this._element = element; this._scrollElement = element.tagName === 'BODY' ? window : element; this._config = $.extend({}, Default, config); this._selector = '' + (this._config.target || '') + ' .nav li > a'; @@ -131,6 +134,21 @@ _this._targets.push(item[1]); }); } + }, { + key: 'dispose', + value: function dispose() { + $.removeData(this._element, DATA_KEY); + $(this._scrollElement).off(EVENT_KEY); + + this._element = null; + this._scrollElement = null; + this._config = null; + this._selector = null; + this._offsets = null; + this._targets = null; + this._activeTarget = null; + this._scrollHeight = null; + } }, { key: '_getScrollTop', @@ -257,7 +275,7 @@ * ------------------------------------------------------------------------ */ - $(window).on(Event.LOAD, function () { + $(window).on(Event.LOAD_DATA_API, function () { var scrollSpys = $.makeArray($(Selector.DATA_SPY)); for (var i = scrollSpys.length; i--;) { diff --git a/dist/js/umd/tab.js b/dist/js/umd/tab.js index fe51b131c..fc1a54693 100644 --- a/dist/js/umd/tab.js +++ b/dist/js/umd/tab.js @@ -39,15 +39,17 @@ var NAME = 'tab'; var VERSION = '4.0.0'; var DATA_KEY = 'bs.tab'; + var EVENT_KEY = '.' + DATA_KEY; + var DATA_API_KEY = '.data-api'; var JQUERY_NO_CONFLICT = $.fn[NAME]; var TRANSITION_DURATION = 150; var Event = { - HIDE: 'hide.bs.tab', - HIDDEN: 'hidden.bs.tab', - SHOW: 'show.bs.tab', - SHOWN: 'shown.bs.tab', - CLICK: 'click.bs.tab.data-api' + HIDE: 'hide' + EVENT_KEY, + HIDDEN: 'hidden' + EVENT_KEY, + SHOW: 'show' + EVENT_KEY, + SHOWN: 'shown' + EVENT_KEY, + CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY }; var ClassName = { @@ -151,6 +153,12 @@ complete(); } } + }, { + key: 'dispose', + value: function dispose() { + $.removeClass(this._element, DATA_KEY); + this._element = null; + } }, { key: '_activate', @@ -264,7 +272,7 @@ * ------------------------------------------------------------------------ */ - $(document).on(Event.CLICK, Selector.DATA_TOGGLE, function (event) { + $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { event.preventDefault(); Tab._jQueryInterface.call($(this), 'show'); }); diff --git a/dist/js/umd/tooltip.js b/dist/js/umd/tooltip.js index 9c57b0d8f..a2c692ecc 100644 --- a/dist/js/umd/tooltip.js +++ b/dist/js/umd/tooltip.js @@ -39,6 +39,7 @@ var NAME = 'tooltip'; var VERSION = '4.0.0'; var DATA_KEY = 'bs.tooltip'; + var EVENT_KEY = '.' + DATA_KEY; var JQUERY_NO_CONFLICT = $.fn[NAME]; var TRANSITION_DURATION = 150; var CLASS_PREFIX = 'bs-tether'; @@ -69,16 +70,16 @@ }; var Event = { - HIDE: 'hide.bs.tooltip', - HIDDEN: 'hidden.bs.tooltip', - SHOW: 'show.bs.tooltip', - SHOWN: 'shown.bs.tooltip', - INSERTED: 'inserted.bs.tooltip', - CLICK: 'click.bs.tooltip', - FOCUSIN: 'focusin.bs.tooltip', - FOCUSOUT: 'focusout.bs.tooltip', - MOUSEENTER: 'mouseenter.bs.tooltip', - MOUSELEAVE: 'mouseleave.bs.tooltip' + HIDE: 'hide' + EVENT_KEY, + HIDDEN: 'hidden' + EVENT_KEY, + SHOW: 'show' + EVENT_KEY, + SHOWN: 'shown' + EVENT_KEY, + INSERTED: 'inserted' + EVENT_KEY, + CLICK: 'click' + EVENT_KEY, + FOCUSIN: 'focusin' + EVENT_KEY, + FOCUSOUT: 'focusout' + EVENT_KEY, + MOUSEENTER: 'mouseenter' + EVENT_KEY, + MOUSELEAVE: 'mouseleave' + EVENT_KEY }; var ClassName = { @@ -172,25 +173,34 @@ } } }, { - key: 'destroy', - value: function destroy() { - var _this = this; - + key: 'dispose', + value: function dispose() { clearTimeout(this._timeout); - this.hide(function () { - $(_this.element).off('.' + _this.constructor.NAME).removeData(_this.constructor.DATA_KEY); - if (_this.tip) { - $(_this.tip).detach(); - } + this.cleanupTether(); - _this.tip = null; - }); + $.removeData(this.element, this.constructor.DATA_KEY); + + $(this.element).off(this.constructor.EVENT_KEY); + + if (this.tip) { + $(this.tip).remove(); + } + + this._isEnabled = null; + this._timeout = null; + this._hoverState = null; + this._activeTrigger = null; + this._tether = null; + + this.element = null; + this.config = null; + this.tip = null; } }, { key: 'show', value: function show() { - var _this2 = this; + var _this = this; var showEvent = $.Event(this.constructor.Event.SHOW); @@ -239,13 +249,13 @@ $(tip).addClass(ClassName.IN); var complete = function complete() { - var prevHoverState = _this2._hoverState; - _this2._hoverState = null; + var prevHoverState = _this._hoverState; + _this._hoverState = null; - $(_this2.element).trigger(_this2.constructor.Event.SHOWN); + $(_this.element).trigger(_this.constructor.Event.SHOWN); if (prevHoverState === HoverState.OUT) { - _this2._leave(null, _this2); + _this._leave(null, _this); } }; @@ -255,18 +265,18 @@ }, { key: 'hide', value: function hide(callback) { - var _this3 = this; + var _this2 = this; var tip = this.getTipElement(); var hideEvent = $.Event(this.constructor.Event.HIDE); var complete = function complete() { - if (_this3._hoverState !== HoverState.IN && tip.parentNode) { + if (_this2._hoverState !== HoverState.IN && tip.parentNode) { tip.parentNode.removeChild(tip); } - _this3.element.removeAttribute('aria-describedby'); - $(_this3.element).trigger(_this3.constructor.Event.HIDDEN); - _this3.cleanupTether(); + _this2.element.removeAttribute('aria-describedby'); + $(_this2.element).trigger(_this2.constructor.Event.HIDDEN); + _this2.cleanupTether(); if (callback) { callback(); @@ -351,18 +361,18 @@ }, { key: '_setListeners', value: function _setListeners() { - var _this4 = this; + var _this3 = this; var triggers = this.config.trigger.split(' '); triggers.forEach(function (trigger) { if (trigger === 'click') { - $(_this4.element).on(_this4.constructor.Event.CLICK, _this4.config.selector, $.proxy(_this4.toggle, _this4)); + $(_this3.element).on(_this3.constructor.Event.CLICK, _this3.config.selector, $.proxy(_this3.toggle, _this3)); } else if (trigger !== Trigger.MANUAL) { - var eventIn = trigger == Trigger.HOVER ? _this4.constructor.Event.MOUSEENTER : _this4.constructor.Event.FOCUSIN; - var eventOut = trigger == Trigger.HOVER ? _this4.constructor.Event.MOUSELEAVE : _this4.constructor.Event.FOCUSOUT; + var eventIn = trigger == Trigger.HOVER ? _this3.constructor.Event.MOUSEENTER : _this3.constructor.Event.FOCUSIN; + var eventOut = trigger == Trigger.HOVER ? _this3.constructor.Event.MOUSELEAVE : _this3.constructor.Event.FOCUSOUT; - $(_this4.element).on(eventIn, _this4.config.selector, $.proxy(_this4._enter, _this4)).on(eventOut, _this4.config.selector, $.proxy(_this4._leave, _this4)); + $(_this3.element).on(eventIn, _this3.config.selector, $.proxy(_this3._enter, _this3)).on(eventOut, _this3.config.selector, $.proxy(_this3._leave, _this3)); } }); @@ -529,6 +539,11 @@ get: function () { return Event; } + }, { + key: 'EVENT_KEY', + get: function () { + return EVENT_KEY; + } }, { key: '_jQueryInterface', diff --git a/js/dist/alert.js b/js/dist/alert.js index 63b7012b6..876a5f3d0 100644 --- a/js/dist/alert.js +++ b/js/dist/alert.js @@ -22,6 +22,8 @@ var Alert = (function ($) { var NAME = 'alert'; var VERSION = '4.0.0'; var DATA_KEY = 'bs.alert'; + var EVENT_KEY = '.' + DATA_KEY; + var DATA_API_KEY = '.data-api'; var JQUERY_NO_CONFLICT = $.fn[NAME]; var TRANSITION_DURATION = 150; @@ -30,9 +32,9 @@ var Alert = (function ($) { }; var Event = { - CLOSE: 'close.bs.alert', - CLOSED: 'closed.bs.alert', - CLICK: 'click.bs.alert.data-api' + CLOSE: 'close' + EVENT_KEY, + CLOSED: 'closed' + EVENT_KEY, + CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY }; var ClassName = { @@ -71,6 +73,12 @@ var Alert = (function ($) { this._removeElement(rootElement); } + }, { + key: 'dispose', + value: function dispose() { + $.removeData(this._element, DATA_KEY); + this._element = null; + } }, { key: '_getRootElement', @@ -164,7 +172,7 @@ var Alert = (function ($) { * ------------------------------------------------------------------------ */ - $(document).on(Event.CLICK, Selector.DISMISS, Alert._handleDismiss(new Alert())); + $(document).on(Event.CLICK_DATA_API, Selector.DISMISS, Alert._handleDismiss(new Alert())); /** * ------------------------------------------------------------------------ diff --git a/js/dist/alert.js.map b/js/dist/alert.js.map index 00ee26d9891e9acd19d8ba030934a54e69766b6c..a030fb73c8aacde1e21a3c658620ec4766379c17 100644 GIT binary patch delta 661 zcmZusO-lkn7{(8#Vs@220F$)Ba83_B~kuC}1{B8Rr4=7yu|HY)SwmPH+Yw zgDU_PtN@g78K68n5AR+dO6+FIT%jPioYo<@#A({!QCg zG*ESX&0Osl- G$@>kIK)PW7 delta 250 zcmZp&Ibkv3`DAUzW%jO)j-EQ{PL7W0PS%c&&Q(r2p^lEeIzVA}olKx`CRo_eNhjFR z(HkV}sZ$9Qu5_|?cXZBk-mJ#-m2q<)izW+`zRTpD9GZ;Tn;&x+Gl>+ryX$xZwOGRd z(1yuc+yIAOB!i w7X_Gn3Kj*P&fW?T1)0g&aCyCy#F9ka#DYxq%`Sox%$xU%=&^79Ce6bH06twxDgXcg diff --git a/js/dist/button.js b/js/dist/button.js index c9dce2ce7..fe6cfe981 100644 --- a/js/dist/button.js +++ b/js/dist/button.js @@ -22,6 +22,8 @@ var Button = (function ($) { var NAME = 'button'; var VERSION = '4.0.0'; var DATA_KEY = 'bs.button'; + var EVENT_KEY = '.' + DATA_KEY; + var DATA_API_KEY = '.data-api'; var JQUERY_NO_CONFLICT = $.fn[NAME]; var TRANSITION_DURATION = 150; @@ -40,8 +42,8 @@ var Button = (function ($) { }; var Event = { - CLICK: 'click.bs.button.data-api', - FOCUS_BLUR: 'focus.bs.button.data-api blur.bs.button.data-api' + CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY, + FOCUS_BLUR_DATA_API: 'focus' + EVENT_KEY + '' + DATA_API_KEY + ' ' + ('blur' + EVENT_KEY + '' + DATA_API_KEY) }; /** @@ -95,6 +97,12 @@ var Button = (function ($) { $(this._element).toggleClass(ClassName.ACTIVE); } } + }, { + key: 'dispose', + value: function dispose() { + $.removeData(this._element, DATA_KEY); + this._element = null; + } }], [{ key: 'VERSION', @@ -133,7 +141,7 @@ var Button = (function ($) { * ------------------------------------------------------------------------ */ - $(document).on(Event.CLICK, Selector.DATA_TOGGLE_CARROT, function (event) { + $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE_CARROT, function (event) { event.preventDefault(); var button = event.target; @@ -143,7 +151,7 @@ var Button = (function ($) { } Button._jQueryInterface.call($(button), 'toggle'); - }).on(Event.FOCUS_BLUR, Selector.DATA_TOGGLE_CARROT, function (event) { + }).on(Event.FOCUS_BLUR_DATA_API, Selector.DATA_TOGGLE_CARROT, function (event) { var button = $(event.target).closest(Selector.BUTTON)[0]; $(button).toggleClass(ClassName.FOCUS, /^focus(in)?$/.test(event.type)); }); diff --git a/js/dist/button.js.map b/js/dist/button.js.map index 91670e5cd20ee4161d48c8489e23d43c738bd6b4..109755be803c025b397cb7941b17991e8d889553 100644 GIT binary patch delta 738 zcmaJ-O>5Lp6eVG_OkIf3Qm`OzF<=Lup{2O6Q!X(Y48k>({l1S+= zxNzyF5d0yUpU@vr?9y#FZr!@-yUC=Z7Wx)1;oNi1J?DLX@#W>|FQo&}q2h8?x(%>R z0f18`?gju`VYCgsT4jV6NStCZu+KW z=`LpTRfMF~@ArOIHuxUj*zLXIT{1mQVk)(f2D^ZRvH3P2#14ZfCOHOMt-l3L@>uCx zvGvp%xY_yrGwD;Wq!pHH#I!xvKB|qbmyIX(6RWXFaR(vmo6P9+)Yrz&)I-P*LpzCX zk&`@PSzx97DZWpLdEh0(TjXZ;=fUNjeWdr@Xb?uuQk{&7M1<6oq2q@i9Zhsxir>4D v(sMk=cY>G}?;+l(UXuTrlO_og&&w_rx^nfpP#P>g&-xE%r74sJi(lm{2x!w3 delta 274 zcmeBnXttT~VzUlo1fy=SqocQutD|F}j)9Y-qk)sPqoZ?~vre+3V<<@2T_@Yc(J|Y_ z+TGDP!*%m3rjIP_*4EbHj;79&Lpd~=w4FCMa1=0#l)1X=_&PfJ0_7k8sA)0_mjR16 z(EQ03TzX9AE}JvBLK#^?fhL0l7;`p%;=aYQSygZcV}=44SShF{=VT^l>m?QIC6$(x z>%`=N)VTROhX%(x`Gf{309B{uCzk@1VyIR~$|)_vBCfuW~LK~?WyO^j@E6Q|t)2#F-rEO}6bkiNZ8% zOrh-lk|9zwfr=+f4UwW5R1Tl4Jv*}&$08|GjoNm{oRH%qZQFDp>PeSSg^-FA&9&|J zks`#nWbW8f4ws7M7^)I_gi4no>Gr~dAqTu4b-4*3uz5uqgorZ4Gd%W;jmtDT79zvR zfdxY@PK2YLt!%EOO;m5E6`#y)AI)K?6jlwMFV>8DgJ&2{D!qaQ{&JwCHq@)?X4%}oqHueiPPh0%T`!k3Z>w|6P65$& zJfDs#QisU%7WFhH@gOB~@nbS!RYnsu}w$2cw z<*1Ca@_&3?Q=6yyjwZ0QcANwAt=H62Z|8efc2-WEiN&ZQE_J2ESy3++E4|WwrFkDE zhb~ZKrE-0A{~|?(WQ1^11CF{z!$$ delta 503 zcmX@Nf${%R#tE-B>oGbo2D>^sy6faRIXdP#Svxv98$0O)Iy!pl0EInuvVp?cU|~Zi zonS{tZ;-INjtNlM1T0+OjHKGv(b3o1-O)L1@_$Cf%`wadT$3I6v)KxPstcVa{}WJ| zEWp7!`4PViqw(bb{L|RVffD5)340OeG8d51t~$;@C+NT>Tp5iwy9h4hXUYqh{6-;w zDLY`ZouUJqXhEnu$lgF}7;tpd4xKz%U4OEG4D00M>K2S8lQi@v8}M-Q>O?v^MuI$+ z=d9yBnO8w}@^VT3$pwlWn=3W8vuy6vwPUQeQcy3>$xKPrODfh&PAtkVEl$l**NMqf z0D@p2PZtFRs0wTfoP9iKvR5B+uu?*D< ToBQl;h)vE94cdGvw1o)(CNQ7W diff --git a/js/dist/collapse.js b/js/dist/collapse.js index 7a5e5df9b..0d014da2e 100644 --- a/js/dist/collapse.js +++ b/js/dist/collapse.js @@ -22,6 +22,8 @@ var Collapse = (function ($) { var NAME = 'collapse'; var VERSION = '4.0.0'; var DATA_KEY = 'bs.collapse'; + var EVENT_KEY = '.' + DATA_KEY; + var DATA_API_KEY = '.data-api'; var JQUERY_NO_CONFLICT = $.fn[NAME]; var TRANSITION_DURATION = 600; @@ -31,11 +33,11 @@ var Collapse = (function ($) { }; var Event = { - SHOW: 'show.bs.collapse', - SHOWN: 'shown.bs.collapse', - HIDE: 'hide.bs.collapse', - HIDDEN: 'hidden.bs.collapse', - CLICK: 'click.bs.collapse.data-api' + SHOW: 'show' + EVENT_KEY, + SHOWN: 'shown' + EVENT_KEY, + HIDE: 'hide' + EVENT_KEY, + HIDDEN: 'hidden' + EVENT_KEY, + CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY }; var ClassName = { @@ -102,8 +104,8 @@ var Collapse = (function ($) { return; } - var activesData = undefined; var actives = undefined; + var activesData = undefined; if (this._parent) { actives = $.makeArray($(Selector.ACTIVES)); @@ -216,6 +218,17 @@ var Collapse = (function ($) { value: function setTransitioning(isTransitioning) { this._isTransitioning = isTransitioning; } + }, { + key: 'dispose', + value: function dispose() { + $.removeData(this._element, DATA_KEY); + + this._config = null; + this._parent = null; + this._element = null; + this._triggerArray = null; + this._isTransitioning = null; + } }, { key: '_getDimension', @@ -306,7 +319,7 @@ var Collapse = (function ($) { * ------------------------------------------------------------------------ */ - $(document).on(Event.CLICK, Selector.DATA_TOGGLE, function (event) { + $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { event.preventDefault(); var target = Collapse._getTargetFromElement(this); diff --git a/js/dist/collapse.js.map b/js/dist/collapse.js.map index aff0c283e01edb7ef10a15ef6955218b7f300306..8f50a03f36c4abe0af9d571ad3275df928ed045f 100644 GIT binary patch delta 1024 zcma)3&1(}u6ek~AthPmxK(L{VHT?)qLW^j{lFG|w*@iTUX&Td&O0pztvozU+CRQ+n z9>jxqvCQ8g2zwXuFNh~8_8=m7QPHCZ=j~?GP+M^h!_54?-h1=qnd9(<pOX+*4ZyX8^U@ZFtnLU2Mt0SDV^2lme7mZ(B1N^P z)>XYttr_yUhPHI}eTKO8$F&;!HtU

n2fRzV#M-?BmQuix8geGmmcd4?pI-#`My= Okqd(^j9)81oqqt9XCmML delta 453 zcmcc9$@sjPal)&~dW_q1T^$|0b+Vlt9kZRR9UYyGopgdhB0ynJom`-BE?C&qNhc5_ zf~h*x(a{$q?5>j!RGkl2ZH{b+2~gO?$=cn~xx{&M0n<|!;c!RCaGgj;M@JoJAOW&9 zZL&YRC@YZV8nL;F{XXyJbg>R*#;nO7Bm)`KH#WU6mgS8ZjRykDD55ac)og`Ct9g~a5N%(B$t&4;yJc_+Wt Mb%}lROUKVl0A25iZU6uP diff --git a/js/dist/dropdown.js b/js/dist/dropdown.js index 000c59f6b..2ab5cf700 100644 --- a/js/dist/dropdown.js +++ b/js/dist/dropdown.js @@ -22,16 +22,18 @@ var Dropdown = (function ($) { var NAME = 'dropdown'; var VERSION = '4.0.0'; var DATA_KEY = 'bs.dropdown'; + var EVENT_KEY = '.' + DATA_KEY; + var DATA_API_KEY = '.data-api'; var JQUERY_NO_CONFLICT = $.fn[NAME]; var Event = { - HIDE: 'hide.bs.dropdown', - HIDDEN: 'hidden.bs.dropdown', - SHOW: 'show.bs.dropdown', - SHOWN: 'shown.bs.dropdown', - CLICK: 'click.bs.dropdown', - KEYDOWN: 'keydown.bs.dropdown.data-api', - CLICK_DATA: 'click.bs.dropdown.data-api' + HIDE: 'hide' + EVENT_KEY, + HIDDEN: 'hidden' + EVENT_KEY, + SHOW: 'show' + EVENT_KEY, + SHOWN: 'shown' + EVENT_KEY, + CLICK: 'click' + EVENT_KEY, + CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY, + KEYDOWN_DATA_API: 'keydown' + EVENT_KEY + '' + DATA_API_KEY }; var ClassName = { @@ -60,7 +62,9 @@ var Dropdown = (function ($) { function Dropdown(element) { _classCallCheck(this, Dropdown); - $(element).on(Event.CLICK, this.toggle); + this._element = element; + + this._addEventListeners(); } _createClass(Dropdown, [{ @@ -108,6 +112,21 @@ var Dropdown = (function ($) { return false; } + }, { + key: 'dispose', + value: function dispose() { + $.removeData(this._element, DATA_KEY); + $(this._element).off(EVENT_KEY); + this._element = null; + } + }, { + key: '_addEventListeners', + + // private + + value: function _addEventListeners() { + $(this._element).on(Event.CLICK, this.toggle); + } }], [{ key: 'VERSION', @@ -240,7 +259,7 @@ var Dropdown = (function ($) { * ------------------------------------------------------------------------ */ - $(document).on(Event.KEYDOWN, Selector.DATA_TOGGLE, Dropdown._dataApiKeydownHandler).on(Event.KEYDOWN, Selector.ROLE_MENU, Dropdown._dataApiKeydownHandler).on(Event.KEYDOWN, Selector.ROLE_LISTBOX, Dropdown._dataApiKeydownHandler).on(Event.CLICK_DATA, Dropdown._clearMenus).on(Event.CLICK_DATA, Selector.DATA_TOGGLE, Dropdown.prototype.toggle).on(Event.CLICK_DATA, Selector.FORM_CHILD, function (e) { + $(document).on(Event.KEYDOWN_DATA_API, Selector.DATA_TOGGLE, Dropdown._dataApiKeydownHandler).on(Event.KEYDOWN_DATA_API, Selector.ROLE_MENU, Dropdown._dataApiKeydownHandler).on(Event.KEYDOWN_DATA_API, Selector.ROLE_LISTBOX, Dropdown._dataApiKeydownHandler).on(Event.CLICK_DATA_API, Dropdown._clearMenus).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, Dropdown.prototype.toggle).on(Event.CLICK_DATA_API, Selector.FORM_CHILD, function (e) { e.stopPropagation(); }); diff --git a/js/dist/dropdown.js.map b/js/dist/dropdown.js.map index 7cfb1f11999b49db4245a9f702bd2c4aa34cc143..fa59184e944069625d6a0823928e5eb330eb0578 100644 GIT binary patch delta 1480 zcmZ`$O-~b16b-cD!;nZcQ)=+z1u@d_ENO{`+H`T}!_t(tLV>0Uq)a*kj4d7L)S@8- zUAxh|Kj2n3nlvt4nYeJ_%7qK}ZVc}H0ml30wWXzX7L)hxJLlYU@A>iQ-NDP#SQa2l z@n^|&8DN4$2d? z@qNG<$fNlLAJX-@%mM<`XtSynRWgT6=Rz+?*VZS~8^L?pCAx)1lOO z?|JLJu7j4Mdq|3NYb)HdBHE$m8jFqk{hA2F_0S3fx0+?YM#zxjI%4C)5^5-OG9R_a zZ=zX)Xa)m8H^M>^b6#k*u3&Clku403v02{*R`cAvi13Ia;5oRfGJPa4Fxz-B@^#D~ zTIv{wLjVp^28}ZqyUd_c}HfSe17&pnj9=YV8kc2s=uZAbCrm%RqsorXkksBz-6zz&rBW?{ICOQc*ayw|~HT{mhZ?Wf-Dsg!XBRU$4(x(EyY^v!@JS|z+P&z$+R9QwNuEa+%T}?}PuxWpT1!A0 z`tAXzo2zTCsXaBWQblWLbR?I|r-pslykmImB;0BLTDUwyW%)ENA{~$U9Xv~N}<<#r_*M0_V-4laqZTd nvC;M(*_Y76j+-ysdD{+Wy#-8yeGG@h;WWJD9vb)Nrw0E4!=tHd delta 746 zcmZ{g&q^Cn6vjy$5JiwiLnf$n(26PCCYAibcHEq~GmLT6F{B|a6iS*2CK;WvMzBIl z`T~Wv=LNbGq#!zP&}COH-MDbuWpQuMjS+(+cXiIk?|k<==j6jh^V?rchU~ThP-LzK z;A$!WPid?Ku+B)fnNPCck(-8I#ji4=7-O)|$giyoyZVqgY(BDG)x7rSZEQyKTPoHs{@jZc-vF zI>#w5<071hYfwqOC2r8Ex}1!jJU6vx3}$}GYUN{*_Twz$jc%7W?hM`9p@`p0CY{QD)`kfB1K&({Vjz6%z9|*=D xM~1>r5;&Q75%{y0QlKZ!#_%SyiLbMpc$zKZ=lL0&&rOmhV=0#jzUF4b{{g#N++hF! diff --git a/js/dist/modal.js b/js/dist/modal.js index 9170fca4b..25292b275 100644 --- a/js/dist/modal.js +++ b/js/dist/modal.js @@ -22,6 +22,8 @@ var Modal = (function ($) { var NAME = 'modal'; var VERSION = '4.0.0'; 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; @@ -33,17 +35,17 @@ var Modal = (function ($) { }; var Event = { - HIDE: 'hide.bs.modal', - HIDDEN: 'hidden.bs.modal', - SHOW: 'show.bs.modal', - SHOWN: 'shown.bs.modal', - DISMISS: 'click.dismiss.bs.modal', - KEYDOWN: 'keydown.dismiss.bs.modal', - FOCUSIN: 'focusin.bs.modal', - RESIZE: 'resize.bs.modal', - CLICK: 'click.bs.modal.data-api', - MOUSEDOWN: 'mousedown.dismiss.bs.modal', - MOUSEUP: 'mouseup.dismiss.bs.modal' + HIDE: 'hide' + EVENT_KEY, + HIDDEN: 'hidden' + EVENT_KEY, + SHOW: 'show' + EVENT_KEY, + SHOWN: 'shown' + EVENT_KEY, + FOCUSIN: 'focusin' + EVENT_KEY, + RESIZE: 'resize' + EVENT_KEY, + CLICK_DISMISS: 'click.dismiss' + EVENT_KEY, + KEYDOWN_DISMISS: 'keydown.dismiss' + EVENT_KEY, + MOUSEUP_DISMISS: 'mouseup.dismiss' + EVENT_KEY, + MOUSEDOWN_DISMISS: 'mousedown.dismiss' + EVENT_KEY, + CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY }; var ClassName = { @@ -114,10 +116,10 @@ var Modal = (function ($) { this._setEscapeEvent(); this._setResizeEvent(); - $(this._element).on(Event.DISMISS, Selector.DATA_DISMISS, $.proxy(this.hide, this)); + $(this._element).on(Event.CLICK_DISMISS, Selector.DATA_DISMISS, $.proxy(this.hide, this)); - $(this._dialog).on(Event.MOUSEDOWN, function () { - $(_this._element).one(Event.MOUSEUP, function (event) { + $(this._dialog).on(Event.MOUSEDOWN_DISMISS, function () { + $(_this._element).one(Event.MOUSEUP_DISMISS, function (event) { if ($(event.target).is(_this._element)) { that._ignoreBackdropClick = true; } @@ -150,8 +152,8 @@ var Modal = (function ($) { $(this._element).removeClass(ClassName.IN); - $(this._element).off(Event.DISMISS); - $(this._dialog).off(Event.MOUSEDOWN); + $(this._element).off(Event.CLICK_DISMISS); + $(this._dialog).off(Event.MOUSEDOWN_DISMISS); if (Util.supportsTransitionEnd() && $(this._element).hasClass(ClassName.FADE)) { @@ -160,6 +162,26 @@ var Modal = (function ($) { this._hideModal(); } } + }, { + key: 'dispose', + value: function dispose() { + $.removeData(this._element, DATA_KEY); + + $(window).off(EVENT_KEY); + $(document).off(EVENT_KEY); + $(this._element).off(EVENT_KEY); + $(this._backdrop).off(EVENT_KEY); + + this._config = null; + this._element = null; + this._dialog = null; + this._backdrop = null; + this._isShown = null; + this._isBodyOverflowing = null; + this._ignoreBackdropClick = null; + this._originalBodyPadding = null; + this._scrollbarWidth = null; + } }, { key: '_showElement', @@ -219,13 +241,13 @@ var Modal = (function ($) { var _this4 = this; if (this._isShown && this._config.keyboard) { - $(this._element).on(Event.KEYDOWN, function (event) { + $(this._element).on(Event.KEYDOWN_DISMISS, function (event) { if (event.which === 27) { _this4.hide(); } }); } else if (!this._isShown) { - $(this._element).off(Event.KEYDOWN); + $(this._element).off(Event.KEYDOWN_DISMISS); } } }, { @@ -277,7 +299,7 @@ var Modal = (function ($) { $(this._backdrop).appendTo(this.$body); - $(this._element).on(Event.DISMISS, function (event) { + $(this._element).on(Event.CLICK_DISMISS, function (event) { if (_this6._ignoreBackdropClick) { _this6._ignoreBackdropClick = false; return; @@ -442,7 +464,7 @@ var Modal = (function ($) { * ------------------------------------------------------------------------ */ - $(document).on(Event.CLICK, Selector.DATA_TOGGLE, function (event) { + $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { var _this7 = this; var target = undefined; diff --git a/js/dist/modal.js.map b/js/dist/modal.js.map index 3f87651e7b668c862d4dfe49e4ddf3a03c2b34ab..bbdbb1d45d0577014e57efd24e46c3a7d1bc034b 100644 GIT binary patch delta 2105 zcma)6&2J)Q91aMj&}vhG?z)=h&C0G|UST)2L`!J%GBZnOSqj}*+O25<1g6U@pJkw3 z+f;5IP1pD2t^a^AbxwL&^t3A|3ox)rbR4}W{s zgQISOX-GPo5jz~tF=BBr^nhcDL?$$Z1u7|)?tEy6V}uMY4TgGqBa7m{UZ?D3! zS%|DT4riDTz>N12SnMC_W<3May$m3E1m?MfSn>3+V&g zmz)k}4(1zsjn{TA-JP&E*68Zn;|` zm&)^^lolmPrvbiHQ%covSyAhXst$I65G;X*Hcs(?Rh8c_H+LJOc)fHcCkeUiSz^7} zRpoAL6jA4$NeKyc-v6cSH^{6*vLTVRXm)tIv%b6fPC6)PvAJ>Am_er8LT}nE8KYnb z#TU^&Jzjd1{=P76%hT( z@!1J;`#|_Ob76Wwg?>ICpzY|(^w0Sj{ppVy&&}u}y!+^9@M%ZA^rxs_kN?w;uji&F u^b+Ez(XG|AcbEQh8grq`!Y3!Q_*FP`^oOKv-~4pioi~5K+U(}Hj(-8Y7g;6% delta 992 zcmZ{g&u2VHN{Lp}qy$2$5~IPUBh~;RO49lQ!a-x=#iO$eq!46IyHB2Z-*3J@pSkZJxNeX5xt|># zAcYhFB?5p0QIrNqAO;gijRL4q1Bat11t1uB%#{H|14^jG+>+^rq9|h!hDFq3xMku7 z9>J>&ubOzjGs-KBS4@6m>L4ebZDzMkdk>==fNXTeQIO%Fi4R7z2c2=ik1)aj5MeLl zV>CPS)aH=-6XQJT&2<-9g_*^pUA6~f0SA~ocLd0h(?)tumnDqpu|t|+{|<7zG;3pq zh6y+>k<;!);<_+z@25BDi}?+XmKVO+26x>YCMDOq;Z3UyxIvOW4|(P}OS5jzh(}+Z z+c{+^r^&A?+m@BP^w#pB#Tm-Pk;pb186JS<4*9Zj&1z6$L4NKby^bE+sV8XVIyb$( zvRYL9dEH;D7jsn~%4%MAHicM>PkKMT_ImqDQPCzOc~i6m3P zK~4y=%%WIVp{f=t{-UbaR9&CQ6Zzeklwpa6T2b1?dP|!sZ%8;T3j_HJ-li-vMC;c#RAVs1ZoHP=vwt4l~}nKy@Id9`{|SEdiS z%o0sMz1`0?{bpnGNfd|Y>?F0;Az#-*j;#{WAHTnxz+0PZsE#{3q)_C^Rgu diff --git a/js/dist/popover.js b/js/dist/popover.js index 3a4402f04..b9ef35586 100644 --- a/js/dist/popover.js +++ b/js/dist/popover.js @@ -24,6 +24,7 @@ var Popover = (function ($) { var NAME = 'popover'; var VERSION = '4.0.0'; var DATA_KEY = 'bs.popover'; + var EVENT_KEY = '.' + DATA_KEY; var JQUERY_NO_CONFLICT = $.fn[NAME]; var Default = $.extend({}, Tooltip.Default, { @@ -45,16 +46,16 @@ var Popover = (function ($) { }; var Event = { - HIDE: 'hide.bs.popover', - HIDDEN: 'hidden.bs.popover', - SHOW: 'show.bs.popover', - SHOWN: 'shown.bs.popover', - INSERTED: 'inserted.bs.popover', - CLICK: 'click.bs.popover', - FOCUSIN: 'focusin.bs.popover', - FOCUSOUT: 'focusout.bs.popover', - MOUSEENTER: 'mouseenter.bs.popover', - MOUSELEAVE: 'mouseleave.bs.popover' + HIDE: 'hide' + EVENT_KEY, + HIDDEN: 'hidden' + EVENT_KEY, + SHOW: 'show' + EVENT_KEY, + SHOWN: 'shown' + EVENT_KEY, + INSERTED: 'inserted' + EVENT_KEY, + CLICK: 'click' + EVENT_KEY, + FOCUSIN: 'focusin' + EVENT_KEY, + FOCUSOUT: 'focusout' + EVENT_KEY, + MOUSEENTER: 'mouseenter' + EVENT_KEY, + MOUSELEAVE: 'mouseleave' + EVENT_KEY }; /** @@ -142,6 +143,11 @@ var Popover = (function ($) { get: function () { return Event; } + }, { + key: 'EVENT_KEY', + get: function () { + return EVENT_KEY; + } }, { key: '_jQueryInterface', diff --git a/js/dist/popover.js.map b/js/dist/popover.js.map index bcb5ed8b44ddfb6658b26967e1075f8bcad42f12..5f29d837d8be04494f7b14112639cf9e08cd5745 100644 GIT binary patch delta 851 zcmZ{g&q@M89LGrujG(`UbSOO7C8nfn;^DXBXp7n)>n1|bmQK2+Yq(lOh(Rw9?4@Vu z7W)9v19a>SIuyM@r)G8+Lw23RuE?78j|oRjw*ztgj9ecI`c~{EI={}PH{>eRsE?Z7Jo~K`K6J8#qen{K8K>3 zKh~a3iW)^Q0R8Kk2x(m$=J78H6y@ z?9S4CXrwjuI!oM*149j+7$S5iXENl-i66v;tImudpK?em-Vp9Ho86mfE*BQ}TrMo) zt~u1KtJUa8(+!jL`m7#=zy%rS-ANo#YwNYkAX}DVRgs-p+;-8e4NN_7amPs2GDmvG z6|+0&PcW_JwWzFhx&xCjqtAL1qE}RrstPF(I3|MQc-!pkda_i}>Cj3pp4;zhZ!^|& UbZO41+}d4_&5z5sAJ%UoeYE00wZ<7OB*sgLYA&TbH996#P>hE|)V6{S(?W7QsQAo-{UX+N7z2LI+=< zkXP^xGKvU3fUlw8<|q!{U9hN4Z#q7Hd>?mjN1w&ndyp1hgeitl1EvU}DHb6_2O`iR ztO6RVpikpIkGlxeAyioWPiqjCSzHG_s(V})L~zOy8kfO{#v>kE2rTGxx=DG9%~4(j zHsv=g=q(~C3v0L^q%TR|5BA8ZE zTO4ubcJ1pWD6C>#49%;izb2KMh8s;Rg_GvMCC-?1BKlB8LFI6j_8FFG^di);igZok zyHs7;hUc2|-JjVht>IABo8c~pwl|Jwtg5<(ajl6P>>YjEa|s!YiL;DWFg(F?YLSb{ VpPyzQ?Qd+igPZkdA-K(0$!{3D%mx4e diff --git a/js/dist/scrollspy.js b/js/dist/scrollspy.js index d3e170110..a748f7782 100644 --- a/js/dist/scrollspy.js +++ b/js/dist/scrollspy.js @@ -22,6 +22,8 @@ var ScrollSpy = (function ($) { var NAME = 'scrollspy'; var VERSION = '4.0.0'; var DATA_KEY = 'bs.scrollspy'; + var EVENT_KEY = '.' + DATA_KEY; + var DATA_API_KEY = '.data-api'; var JQUERY_NO_CONFLICT = $.fn[NAME]; var Default = { @@ -29,9 +31,9 @@ var ScrollSpy = (function ($) { }; var Event = { - ACTIVATE: 'activate.bs.scrollspy', - SCROLL: 'scroll.bs.scrollspy', - LOAD: 'load.bs.scrollspy.data-api' + ACTIVATE: 'activate' + EVENT_KEY, + SCROLL: 'scroll' + EVENT_KEY, + LOAD_DATA_API: 'load' + EVENT_KEY + '' + DATA_API_KEY }; var ClassName = { @@ -56,6 +58,7 @@ var ScrollSpy = (function ($) { function ScrollSpy(element, config) { _classCallCheck(this, ScrollSpy); + this._element = element; this._scrollElement = element.tagName === 'BODY' ? window : element; this._config = $.extend({}, Default, config); this._selector = '' + (this._config.target || '') + ' .nav li > a'; @@ -114,6 +117,21 @@ var ScrollSpy = (function ($) { _this._targets.push(item[1]); }); } + }, { + key: 'dispose', + value: function dispose() { + $.removeData(this._element, DATA_KEY); + $(this._scrollElement).off(EVENT_KEY); + + this._element = null; + this._scrollElement = null; + this._config = null; + this._selector = null; + this._offsets = null; + this._targets = null; + this._activeTarget = null; + this._scrollHeight = null; + } }, { key: '_getScrollTop', @@ -240,7 +258,7 @@ var ScrollSpy = (function ($) { * ------------------------------------------------------------------------ */ - $(window).on(Event.LOAD, function () { + $(window).on(Event.LOAD_DATA_API, function () { var scrollSpys = $.makeArray($(Selector.DATA_SPY)); for (var i = scrollSpys.length; i--;) { diff --git a/js/dist/scrollspy.js.map b/js/dist/scrollspy.js.map index 33b866da15150665c2e57e21bb2090220ce60358..9a134b521f1847d87736c0a4d652d68dd1206553 100644 GIT binary patch delta 1066 zcma)4%WD%s7-zSQ5U7U|qO>J(gn$W-ktjtl2Kwz}SyDGm(=?VqAsLcQ6WBaR)*K8W zXK(8M6^eLS@RW-;PoDe(DtIf19=v&QX7jU02LFqX936)f{Oq}Tmz_KjU$f$j)H6J`RAuq1E8mHg^J*EnniGx)9A&kA;Db* zfO4U#%VM^g>%hIU8W1z@yq3144G~D#mHu*C%k{*ZIchFJbaf74dg_SqtOfV}JYd1A ziLqsrB}@~b$!DkGKVw9D3{&Npxe&i7B*HLI`7c8M6X;(U`};~JyokJ$qQm0S?D_oJAGBw8qPHXL(J2-K=6?-;f^FwjR1fLuBX#ev z{!p!rfHwX;;Z6tGwvPQ{sFFES#!ZTBp@IBn=kPlL2}+E O7Hi>P49+OCkbeTphA!p+ delta 329 zcmexUur6c5>&g0zP4=#ij_x|8PL7VHPS%c&&NokE~+Ay_!WStroZ z(Gw)>uVVrfHgU3ccXY0B-ps}%&A8c>*^Egb&0Qzh(J|N>1QH#!oi_Kd=CEvD#eI~M z$lG&#<>%xS7gVb2#N;UeL9la>zmE@)0aOT)#H!54-_Zr6 z9HcBKKQRSGkzPt-Nuq9IL8dy$%-Wbd5S5&tS6rg7xn7QwY4ciz%WRw3G&k~WK47|s F2>=b2W*-0m diff --git a/js/dist/tab.js b/js/dist/tab.js index b5108deea..d2935869d 100644 --- a/js/dist/tab.js +++ b/js/dist/tab.js @@ -22,15 +22,17 @@ var Tab = (function ($) { var NAME = 'tab'; var VERSION = '4.0.0'; var DATA_KEY = 'bs.tab'; + var EVENT_KEY = '.' + DATA_KEY; + var DATA_API_KEY = '.data-api'; var JQUERY_NO_CONFLICT = $.fn[NAME]; var TRANSITION_DURATION = 150; var Event = { - HIDE: 'hide.bs.tab', - HIDDEN: 'hidden.bs.tab', - SHOW: 'show.bs.tab', - SHOWN: 'shown.bs.tab', - CLICK: 'click.bs.tab.data-api' + HIDE: 'hide' + EVENT_KEY, + HIDDEN: 'hidden' + EVENT_KEY, + SHOW: 'show' + EVENT_KEY, + SHOWN: 'shown' + EVENT_KEY, + CLICK_DATA_API: 'click' + EVENT_KEY + '' + DATA_API_KEY }; var ClassName = { @@ -134,6 +136,12 @@ var Tab = (function ($) { complete(); } } + }, { + key: 'dispose', + value: function dispose() { + $.removeClass(this._element, DATA_KEY); + this._element = null; + } }, { key: '_activate', @@ -247,7 +255,7 @@ var Tab = (function ($) { * ------------------------------------------------------------------------ */ - $(document).on(Event.CLICK, Selector.DATA_TOGGLE, function (event) { + $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { event.preventDefault(); Tab._jQueryInterface.call($(this), 'show'); }); diff --git a/js/dist/tab.js.map b/js/dist/tab.js.map index 2b18f3bdb1724d93596754e597ae185a47bc1038..9e7b58298a2a96db2292503311606243ba44b966 100644 GIT binary patch delta 758 zcmZ{g!A{#i5QdeA10*fIm=v{AyN3u8X&aSGRS`vKys?a%CX@#1MyeEBiA78t+l>tz zq6qa3K>HTlBHuXj0F^lPR8I6gx)UcZYSTTewDbS-{X27i^u2%atI`B$QgPWb-3QpG z0H9DN?lJ(|VzdrWr!9aMRRIpE4xlIU>E+$oxu|$D5}MOqY;zes#5VI^X~-}}L(YOO zL8)Qb-;&R0Uk2!)rpH-=qT=&WD~?rx`PJw;rLVj&L8;S$@T>TlkLYLkXEyyk|Mp~! z-)5wuD1;0VS}ab-7elI4o7JGa2W%)utJxpR>9EFEr996{H1#!lD_y1}r>^2s)bjiQ zyx~9BUh{Xk41b#2NFOWFPHw!^P(CS*gLX}6kw2$Gj8cA7g#$ogY3D7sl4%V- zXb&4IWV6&YL-UpC+kEoOKc9oPiP5vWR(_OZj17t`LUy%kRcXwPBzAT!cagWbyQe2k zg5IF#o&C?*AfFTS%({@u-fOJZp3j5Sj$?QF53#cq%*GuX(d79}rh@dY9r#{g6^djO z&qGMQG_(fZsl^;K2nu1(4oYpyu?ChK(s*rRl|}ye<@%C);y6)nL(Z-w`O($ZcKSD3 CHPvhY delta 393 zcmX??{Um+D)5)5Q1@*3uj@~+nj*f}ej*iYHPCB8Ej=nlTL3f>0N5@o(pD^E>V<986i>lV6LdOnxDv!Ps{KJ8&fYQYo`Q=z7{os=5TAh77oxQ=b$vK(H*@95bdMSw| hiMojend+PMWDjv|4$&~@X3|lZ9AF@_d6lsW69D{abFcsa diff --git a/js/dist/tooltip.js b/js/dist/tooltip.js index 3c76a1442..b4db8deca 100644 --- a/js/dist/tooltip.js +++ b/js/dist/tooltip.js @@ -22,6 +22,7 @@ var Tooltip = (function ($) { var NAME = 'tooltip'; var VERSION = '4.0.0'; var DATA_KEY = 'bs.tooltip'; + var EVENT_KEY = '.' + DATA_KEY; var JQUERY_NO_CONFLICT = $.fn[NAME]; var TRANSITION_DURATION = 150; var CLASS_PREFIX = 'bs-tether'; @@ -52,16 +53,16 @@ var Tooltip = (function ($) { }; var Event = { - HIDE: 'hide.bs.tooltip', - HIDDEN: 'hidden.bs.tooltip', - SHOW: 'show.bs.tooltip', - SHOWN: 'shown.bs.tooltip', - INSERTED: 'inserted.bs.tooltip', - CLICK: 'click.bs.tooltip', - FOCUSIN: 'focusin.bs.tooltip', - FOCUSOUT: 'focusout.bs.tooltip', - MOUSEENTER: 'mouseenter.bs.tooltip', - MOUSELEAVE: 'mouseleave.bs.tooltip' + HIDE: 'hide' + EVENT_KEY, + HIDDEN: 'hidden' + EVENT_KEY, + SHOW: 'show' + EVENT_KEY, + SHOWN: 'shown' + EVENT_KEY, + INSERTED: 'inserted' + EVENT_KEY, + CLICK: 'click' + EVENT_KEY, + FOCUSIN: 'focusin' + EVENT_KEY, + FOCUSOUT: 'focusout' + EVENT_KEY, + MOUSEENTER: 'mouseenter' + EVENT_KEY, + MOUSELEAVE: 'mouseleave' + EVENT_KEY }; var ClassName = { @@ -155,25 +156,34 @@ var Tooltip = (function ($) { } } }, { - key: 'destroy', - value: function destroy() { - var _this = this; - + key: 'dispose', + value: function dispose() { clearTimeout(this._timeout); - this.hide(function () { - $(_this.element).off('.' + _this.constructor.NAME).removeData(_this.constructor.DATA_KEY); - if (_this.tip) { - $(_this.tip).detach(); - } + this.cleanupTether(); - _this.tip = null; - }); + $.removeData(this.element, this.constructor.DATA_KEY); + + $(this.element).off(this.constructor.EVENT_KEY); + + if (this.tip) { + $(this.tip).remove(); + } + + this._isEnabled = null; + this._timeout = null; + this._hoverState = null; + this._activeTrigger = null; + this._tether = null; + + this.element = null; + this.config = null; + this.tip = null; } }, { key: 'show', value: function show() { - var _this2 = this; + var _this = this; var showEvent = $.Event(this.constructor.Event.SHOW); @@ -222,13 +232,13 @@ var Tooltip = (function ($) { $(tip).addClass(ClassName.IN); var complete = function complete() { - var prevHoverState = _this2._hoverState; - _this2._hoverState = null; + var prevHoverState = _this._hoverState; + _this._hoverState = null; - $(_this2.element).trigger(_this2.constructor.Event.SHOWN); + $(_this.element).trigger(_this.constructor.Event.SHOWN); if (prevHoverState === HoverState.OUT) { - _this2._leave(null, _this2); + _this._leave(null, _this); } }; @@ -238,18 +248,18 @@ var Tooltip = (function ($) { }, { key: 'hide', value: function hide(callback) { - var _this3 = this; + var _this2 = this; var tip = this.getTipElement(); var hideEvent = $.Event(this.constructor.Event.HIDE); var complete = function complete() { - if (_this3._hoverState !== HoverState.IN && tip.parentNode) { + if (_this2._hoverState !== HoverState.IN && tip.parentNode) { tip.parentNode.removeChild(tip); } - _this3.element.removeAttribute('aria-describedby'); - $(_this3.element).trigger(_this3.constructor.Event.HIDDEN); - _this3.cleanupTether(); + _this2.element.removeAttribute('aria-describedby'); + $(_this2.element).trigger(_this2.constructor.Event.HIDDEN); + _this2.cleanupTether(); if (callback) { callback(); @@ -334,18 +344,18 @@ var Tooltip = (function ($) { }, { key: '_setListeners', value: function _setListeners() { - var _this4 = this; + var _this3 = this; var triggers = this.config.trigger.split(' '); triggers.forEach(function (trigger) { if (trigger === 'click') { - $(_this4.element).on(_this4.constructor.Event.CLICK, _this4.config.selector, $.proxy(_this4.toggle, _this4)); + $(_this3.element).on(_this3.constructor.Event.CLICK, _this3.config.selector, $.proxy(_this3.toggle, _this3)); } else if (trigger !== Trigger.MANUAL) { - var eventIn = trigger == Trigger.HOVER ? _this4.constructor.Event.MOUSEENTER : _this4.constructor.Event.FOCUSIN; - var eventOut = trigger == Trigger.HOVER ? _this4.constructor.Event.MOUSELEAVE : _this4.constructor.Event.FOCUSOUT; + var eventIn = trigger == Trigger.HOVER ? _this3.constructor.Event.MOUSEENTER : _this3.constructor.Event.FOCUSIN; + var eventOut = trigger == Trigger.HOVER ? _this3.constructor.Event.MOUSELEAVE : _this3.constructor.Event.FOCUSOUT; - $(_this4.element).on(eventIn, _this4.config.selector, $.proxy(_this4._enter, _this4)).on(eventOut, _this4.config.selector, $.proxy(_this4._leave, _this4)); + $(_this3.element).on(eventIn, _this3.config.selector, $.proxy(_this3._enter, _this3)).on(eventOut, _this3.config.selector, $.proxy(_this3._leave, _this3)); } }); @@ -512,6 +522,11 @@ var Tooltip = (function ($) { get: function () { return Event; } + }, { + key: 'EVENT_KEY', + get: function () { + return EVENT_KEY; + } }, { key: '_jQueryInterface', diff --git a/js/dist/tooltip.js.map b/js/dist/tooltip.js.map index 16e875bc1cca260f3b6c33710e390d2369fbdb09..ce5ce2d804ec36055102594d4c9a0a9cbc9adb7b 100644 GIT binary patch delta 1393 zcmZ`%O-vI(6b_}7pB4%h3Q7uVEJATaeiCCK6sEglX`pOiTPg&#wQQwOwy|z%UB$vc|Olieel_iQ?9h$b>?uG>fW? zquFBCqR6UKNG)z{X(BT}i$;B9lq{xY&Q_#?ln_PfKru}(>e&z14q`EHv|Ag>Ez6S8 zU-`EjuGoE5Gz~HkK(laQYk@s?WgQ(=WC4mSp(ynFnyiFkVAbn^eY@SNOGtsWMi-3w zYHcD4VjP4wjtlUqxdxW&9UdA(2!+_eMOYs(0T%llG}JaheTx%19L`z=i+W&)4Iokf z&lQ(o&R$c;zanKtxd=?!-E}mg7&DSjN_77uE16ad<&_zLmSV^5n2WRRj>dt1l`U3{ zt-Eb&t>$-xzwO#Q6*3lA1BT}KXmf|z=i;t(2ack#F2fC1cUc%7x;^xKau>LoK|GIDpE%nB#JVIkh*-H>nuv&LrJ*ttGX9*-}k7gX=Y zF<~=~<~2qd3rP~0=q= zw3bu#yt;5&;r(FaRy>(WCznsv59hooi%})S2c-(BY_gC`m$c$QIT|soI51ntmy!(2 zQH9U|$ut{kC0odisH&D%^)tZ}1kaEou$oa5>!&j{HixPz;M<539S7az6E@7G1wmKy z1zi)4duDypcszPgZcFD@vpE%>OFr0+SHWw!t<~G3t1H=cRZ8R&UHQdyu7`TA&=HXU zmx&ji#u_ZC6nrPH+M|o$o7d(wxJlZfd*+;_%Lh9V7yKNpxASi|ENF#H20HxhHugY~ m7bng`+;6q=ddlB!K0NbZg)e@m`LgG4HXj@#9^)Ok-T5Dbo|W$a delta 1120 zcmZ{hO-~b16o%6l@rx3OEn*tACd9UQGbpkUhZ^tP4sBDX6BwGthQtoj!H#WbU_L-X zkeIkKE==w(aN%AvCa#SCgOx5_7V&VVTPR(HevmDldQzp*xJ8lE6c%5V-=@ ziM-C_E&@mBCh1A=I&DXA1vmtE82$vEmZi+?SUm|V(`F5zA8y7@_nYwmZ1*y?g<_oyAc>?H5}M1}xiY@|4Pjf?TCv>APtPwM_dMOe?8%1~JTQJDVp!+=_Zp=)h`# zw#3c3gqX2x&vbpWb&LUeP(~Hrh8P%K%jon|`2Ad>omq8^z_SjV`(~L}QB6~8OMDi_ zIf38rus^h-)-+kJF3F2DXwL~e)3kll?MLy=eBvTM>zew;q1}bc`7@`&H`1TjIn(o9 zXDgdaZ)3+u;!pDsdTpoWNEwg`YLf4w0#ILd*1Zqn*W(#mfmIr1NPz=yw0r L@8rU_rAL{+B6Ug! diff --git a/js/src/alert.js b/js/src/alert.js index 57a59746a..eda74d706 100644 --- a/js/src/alert.js +++ b/js/src/alert.js @@ -20,6 +20,8 @@ const Alert = (($) => { const NAME = 'alert' const VERSION = '4.0.0' const DATA_KEY = 'bs.alert' + const EVENT_KEY = `.${DATA_KEY}` + const DATA_API_KEY = '.data-api' const JQUERY_NO_CONFLICT = $.fn[NAME] const TRANSITION_DURATION = 150 @@ -28,9 +30,9 @@ const Alert = (($) => { } const Event = { - CLOSE : 'close.bs.alert', - CLOSED : 'closed.bs.alert', - CLICK : 'click.bs.alert.data-api' + CLOSE : `close${EVENT_KEY}`, + CLOSED : `closed${EVENT_KEY}`, + CLICK_DATA_API : `click${EVENT_KEY}${DATA_API_KEY}` } const ClassName = { @@ -75,6 +77,11 @@ const Alert = (($) => { this._removeElement(rootElement) } + dispose() { + $.removeData(this._element, DATA_KEY) + this._element = null + } + // private @@ -159,7 +166,7 @@ const Alert = (($) => { */ $(document).on( - Event.CLICK, + Event.CLICK_DATA_API, Selector.DISMISS, Alert._handleDismiss(new Alert()) ) diff --git a/js/src/button.js b/js/src/button.js index 7520de2f6..8210e8ae0 100644 --- a/js/src/button.js +++ b/js/src/button.js @@ -17,6 +17,8 @@ const Button = (($) => { const NAME = 'button' const VERSION = '4.0.0' const DATA_KEY = 'bs.button' + const EVENT_KEY = `.${DATA_KEY}` + const DATA_API_KEY = '.data-api' const JQUERY_NO_CONFLICT = $.fn[NAME] const TRANSITION_DURATION = 150 @@ -35,8 +37,9 @@ const Button = (($) => { } const Event = { - CLICK : 'click.bs.button.data-api', - FOCUS_BLUR : 'focus.bs.button.data-api blur.bs.button.data-api' + CLICK_DATA_API : `click${EVENT_KEY}${DATA_API_KEY}`, + FOCUS_BLUR_DATA_API : `focus${EVENT_KEY}${DATA_API_KEY} ` + + `blur${EVENT_KEY}${DATA_API_KEY}` } @@ -101,6 +104,11 @@ const Button = (($) => { } } + dispose() { + $.removeData(this._element, DATA_KEY) + this._element = null + } + // static @@ -129,7 +137,7 @@ const Button = (($) => { */ $(document) - .on(Event.CLICK, Selector.DATA_TOGGLE_CARROT, function (event) { + .on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE_CARROT, function (event) { event.preventDefault() let button = event.target @@ -140,7 +148,7 @@ const Button = (($) => { Button._jQueryInterface.call($(button), 'toggle') }) - .on(Event.FOCUS_BLUR, Selector.DATA_TOGGLE_CARROT, function (event) { + .on(Event.FOCUS_BLUR_DATA_API, Selector.DATA_TOGGLE_CARROT, function (event) { var button = $(event.target).closest(Selector.BUTTON)[0] $(button).toggleClass(ClassName.FOCUS, /^focus(in)?$/.test(event.type)) }) diff --git a/js/src/carousel.js b/js/src/carousel.js index 8c9b45247..a4b6da298 100644 --- a/js/src/carousel.js +++ b/js/src/carousel.js @@ -20,6 +20,8 @@ const Carousel = (($) => { const NAME = 'carousel' const VERSION = '4.0.0' const DATA_KEY = 'bs.carousel' + const EVENT_KEY = `.${DATA_KEY}` + const DATA_API_KEY = '.data-api' const JQUERY_NO_CONFLICT = $.fn[NAME] const TRANSITION_DURATION = 600 @@ -37,10 +39,13 @@ const Carousel = (($) => { } const Event = { - SLIDE : 'slide.bs.carousel', - SLID : 'slid.bs.carousel', - CLICK : 'click.bs.carousel.data-api', - LOAD : 'load' + SLIDE : `slide${EVENT_KEY}`, + SLID : `slid${EVENT_KEY}`, + KEYDOWN : `keydown${EVENT_KEY}`, + MOUSEENTER : `mouseenter${EVENT_KEY}`, + MOUSELEAVE : `mouseleave${EVENT_KEY}`, + LOAD_DATA_API : `load${EVENT_KEY}${DATA_API_KEY}`, + CLICK_DATA_API : `click${EVENT_KEY}${DATA_API_KEY}` } const ClassName = { @@ -171,20 +176,34 @@ const Carousel = (($) => { this._slide(direction, this._items[index]) } + dispose() { + $(this._element).off(EVENT_KEY) + $.removeData(this._element, DATA_KEY) + + this._items = null + this._config = null + this._element = null + this._interval = null + this._isPaused = null + this._isSliding = null + this._activeElement = null + this._indicatorsElement = null + } + // private _addEventListeners() { if (this._config.keyboard) { $(this._element) - .on('keydown.bs.carousel', $.proxy(this._keydown, this)) + .on(Event.KEYDOWN, $.proxy(this._keydown, this)) } if (this._config.pause == 'hover' && !('ontouchstart' in document.documentElement)) { $(this._element) - .on('mouseenter.bs.carousel', $.proxy(this.pause, this)) - .on('mouseleave.bs.carousel', $.proxy(this.cycle, this)) + .on(Event.MOUSEENTER, $.proxy(this.pause, this)) + .on(Event.MOUSELEAVE, $.proxy(this.cycle, this)) } } @@ -405,9 +424,9 @@ const Carousel = (($) => { */ $(document) - .on(Event.CLICK, Selector.DATA_SLIDE, Carousel._dataApiClickHandler) + .on(Event.CLICK_DATA_API, Selector.DATA_SLIDE, Carousel._dataApiClickHandler) - $(window).on(Event.LOAD, function () { + $(window).on(Event.LOAD_DATA_API, function () { $(Selector.DATA_RIDE).each(function () { let $carousel = $(this) Carousel._jQueryInterface.call($carousel, $carousel.data()) diff --git a/js/src/collapse.js b/js/src/collapse.js index ac506b86b..ded623448 100644 --- a/js/src/collapse.js +++ b/js/src/collapse.js @@ -20,6 +20,8 @@ const Collapse = (($) => { const NAME = 'collapse' const VERSION = '4.0.0' const DATA_KEY = 'bs.collapse' + const EVENT_KEY = `.${DATA_KEY}` + const DATA_API_KEY = '.data-api' const JQUERY_NO_CONFLICT = $.fn[NAME] const TRANSITION_DURATION = 600 @@ -29,11 +31,11 @@ const Collapse = (($) => { } const Event = { - SHOW : 'show.bs.collapse', - SHOWN : 'shown.bs.collapse', - HIDE : 'hide.bs.collapse', - HIDDEN : 'hidden.bs.collapse', - CLICK : 'click.bs.collapse.data-api' + SHOW : `show${EVENT_KEY}`, + SHOWN : `shown${EVENT_KEY}`, + HIDE : `hide${EVENT_KEY}`, + HIDDEN : `hidden${EVENT_KEY}`, + CLICK_DATA_API : `click${EVENT_KEY}${DATA_API_KEY}` } const ClassName = { @@ -110,8 +112,8 @@ const Collapse = (($) => { return } - let activesData let actives + let activesData if (this._parent) { actives = $.makeArray($(Selector.ACTIVES)) @@ -244,6 +246,16 @@ const Collapse = (($) => { this._isTransitioning = isTransitioning } + dispose() { + $.removeData(this._element, DATA_KEY) + + this._config = null + this._parent = null + this._element = null + this._triggerArray = null + this._isTransitioning = null + } + // private @@ -323,7 +335,7 @@ const Collapse = (($) => { * ------------------------------------------------------------------------ */ - $(document).on(Event.CLICK, Selector.DATA_TOGGLE, function (event) { + $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { event.preventDefault() let target = Collapse._getTargetFromElement(this) diff --git a/js/src/dropdown.js b/js/src/dropdown.js index 3135ca73a..bae0f7adb 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -20,16 +20,18 @@ const Dropdown = (($) => { const NAME = 'dropdown' const VERSION = '4.0.0' const DATA_KEY = 'bs.dropdown' + const EVENT_KEY = `.${DATA_KEY}` + const DATA_API_KEY = '.data-api' const JQUERY_NO_CONFLICT = $.fn[NAME] const Event = { - HIDE   : 'hide.bs.dropdown', - HIDDEN   : 'hidden.bs.dropdown', - SHOW   : 'show.bs.dropdown', - SHOWN   : 'shown.bs.dropdown', - CLICK   : 'click.bs.dropdown', - KEYDOWN   : 'keydown.bs.dropdown.data-api', - CLICK_DATA : 'click.bs.dropdown.data-api' + HIDE   : `hide${EVENT_KEY}`, + HIDDEN   : `hidden${EVENT_KEY}`, + SHOW   : `show${EVENT_KEY}`, + SHOWN   : `shown${EVENT_KEY}`, + CLICK   : `click${EVENT_KEY}`, + CLICK_DATA_API : `click${EVENT_KEY}${DATA_API_KEY}`, + KEYDOWN_DATA_API : `keydown${EVENT_KEY}${DATA_API_KEY}` } const ClassName = { @@ -59,7 +61,9 @@ const Dropdown = (($) => { class Dropdown { constructor(element) { - $(element).on(Event.CLICK, this.toggle) + this._element = element + + this._addEventListeners() } @@ -114,6 +118,19 @@ const Dropdown = (($) => { return false } + dispose() { + $.removeData(this._element, DATA_KEY) + $(this._element).off(EVENT_KEY) + this._element = null + } + + + // private + + _addEventListeners() { + $(this._element).on(Event.CLICK, this.toggle) + } + // static @@ -239,12 +256,12 @@ const Dropdown = (($) => { */ $(document) - .on(Event.KEYDOWN, Selector.DATA_TOGGLE, Dropdown._dataApiKeydownHandler) - .on(Event.KEYDOWN, Selector.ROLE_MENU, Dropdown._dataApiKeydownHandler) - .on(Event.KEYDOWN, Selector.ROLE_LISTBOX, Dropdown._dataApiKeydownHandler) - .on(Event.CLICK_DATA, Dropdown._clearMenus) - .on(Event.CLICK_DATA, Selector.DATA_TOGGLE, Dropdown.prototype.toggle) - .on(Event.CLICK_DATA, Selector.FORM_CHILD, function (e) { + .on(Event.KEYDOWN_DATA_API, Selector.DATA_TOGGLE, Dropdown._dataApiKeydownHandler) + .on(Event.KEYDOWN_DATA_API, Selector.ROLE_MENU, Dropdown._dataApiKeydownHandler) + .on(Event.KEYDOWN_DATA_API, Selector.ROLE_LISTBOX, Dropdown._dataApiKeydownHandler) + .on(Event.CLICK_DATA_API, Dropdown._clearMenus) + .on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, Dropdown.prototype.toggle) + .on(Event.CLICK_DATA_API, Selector.FORM_CHILD, function (e) { e.stopPropagation() }) diff --git a/js/src/modal.js b/js/src/modal.js index 300ea2a7f..d0e1ec21b 100644 --- a/js/src/modal.js +++ b/js/src/modal.js @@ -20,6 +20,8 @@ const Modal = (($) => { const NAME = 'modal' const VERSION = '4.0.0' const DATA_KEY = 'bs.modal' + const EVENT_KEY = `.${DATA_KEY}` + const DATA_API_KEY = '.data-api' const JQUERY_NO_CONFLICT = $.fn[NAME] const TRANSITION_DURATION = 300 const BACKDROP_TRANSITION_DURATION = 150 @@ -31,17 +33,17 @@ const Modal = (($) => { } const Event = { - HIDE   : 'hide.bs.modal', - HIDDEN   : 'hidden.bs.modal', - SHOW   : 'show.bs.modal', - SHOWN   : 'shown.bs.modal', - DISMISS : 'click.dismiss.bs.modal', - KEYDOWN : 'keydown.dismiss.bs.modal', - FOCUSIN : 'focusin.bs.modal', - RESIZE : 'resize.bs.modal', - CLICK : 'click.bs.modal.data-api', - MOUSEDOWN : 'mousedown.dismiss.bs.modal', - MOUSEUP : 'mouseup.dismiss.bs.modal' + HIDE   : `hide${EVENT_KEY}`, + HIDDEN   : `hidden${EVENT_KEY}`, + SHOW   : `show${EVENT_KEY}`, + SHOWN   : `shown${EVENT_KEY}`, + FOCUSIN : `focusin${EVENT_KEY}`, + RESIZE : `resize${EVENT_KEY}`, + CLICK_DISMISS : `click.dismiss${EVENT_KEY}`, + KEYDOWN_DISMISS : `keydown.dismiss${EVENT_KEY}`, + MOUSEUP_DISMISS : `mouseup.dismiss${EVENT_KEY}`, + MOUSEDOWN_DISMISS : `mousedown.dismiss${EVENT_KEY}`, + CLICK_DATA_API : `click${EVENT_KEY}${DATA_API_KEY}` } const ClassName = { @@ -119,13 +121,13 @@ const Modal = (($) => { this._setResizeEvent() $(this._element).on( - Event.DISMISS, + Event.CLICK_DISMISS, Selector.DATA_DISMISS, $.proxy(this.hide, this) ) - $(this._dialog).on(Event.MOUSEDOWN, () => { - $(this._element).one(Event.MOUSEUP, (event) => { + $(this._dialog).on(Event.MOUSEDOWN_DISMISS, () => { + $(this._element).one(Event.MOUSEUP_DISMISS, (event) => { if ($(event.target).is(this._element)) { that._ignoreBackdropClick = true } @@ -159,8 +161,8 @@ const Modal = (($) => { $(this._element).removeClass(ClassName.IN) - $(this._element).off(Event.DISMISS) - $(this._dialog).off(Event.MOUSEDOWN) + $(this._element).off(Event.CLICK_DISMISS) + $(this._dialog).off(Event.MOUSEDOWN_DISMISS) if (Util.supportsTransitionEnd() && ($(this._element).hasClass(ClassName.FADE))) { @@ -173,6 +175,25 @@ const Modal = (($) => { } } + dispose() { + $.removeData(this._element, DATA_KEY) + + $(window).off(EVENT_KEY) + $(document).off(EVENT_KEY) + $(this._element).off(EVENT_KEY) + $(this._backdrop).off(EVENT_KEY) + + this._config = null + this._element = null + this._dialog = null + this._backdrop = null + this._isShown = null + this._isBodyOverflowing = null + this._ignoreBackdropClick = null + this._originalBodyPadding = null + this._scrollbarWidth = null + } + // private @@ -228,14 +249,14 @@ const Modal = (($) => { _setEscapeEvent() { if (this._isShown && this._config.keyboard) { - $(this._element).on(Event.KEYDOWN, (event) => { + $(this._element).on(Event.KEYDOWN_DISMISS, (event) => { if (event.which === 27) { this.hide() } }) } else if (!this._isShown) { - $(this._element).off(Event.KEYDOWN) + $(this._element).off(Event.KEYDOWN_DISMISS) } } @@ -280,7 +301,7 @@ const Modal = (($) => { $(this._backdrop).appendTo(this.$body) - $(this._element).on(Event.DISMISS, (event) => { + $(this._element).on(Event.CLICK_DISMISS, (event) => { if (this._ignoreBackdropClick) { this._ignoreBackdropClick = false return @@ -440,7 +461,7 @@ const Modal = (($) => { * ------------------------------------------------------------------------ */ - $(document).on(Event.CLICK, Selector.DATA_TOGGLE, function (event) { + $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { let target let selector = Util.getSelectorFromElement(this) diff --git a/js/src/popover.js b/js/src/popover.js index 6b14a2983..eab4c7e63 100644 --- a/js/src/popover.js +++ b/js/src/popover.js @@ -20,6 +20,7 @@ const Popover = (($) => { const NAME = 'popover' const VERSION = '4.0.0' const DATA_KEY = 'bs.popover' + const EVENT_KEY = `.${DATA_KEY}` const JQUERY_NO_CONFLICT = $.fn[NAME] const Default = $.extend({}, Tooltip.Default, { @@ -44,16 +45,16 @@ const Popover = (($) => { } const Event = { - HIDE : 'hide.bs.popover', - HIDDEN : 'hidden.bs.popover', - SHOW : 'show.bs.popover', - SHOWN : 'shown.bs.popover', - INSERTED : 'inserted.bs.popover', - CLICK : 'click.bs.popover', - FOCUSIN : 'focusin.bs.popover', - FOCUSOUT : 'focusout.bs.popover', - MOUSEENTER : 'mouseenter.bs.popover', - MOUSELEAVE : 'mouseleave.bs.popover' + HIDE : `hide${EVENT_KEY}`, + HIDDEN : `hidden${EVENT_KEY}`, + SHOW : `show${EVENT_KEY}`, + SHOWN : `shown${EVENT_KEY}`, + INSERTED : `inserted${EVENT_KEY}`, + CLICK : `click${EVENT_KEY}`, + FOCUSIN : `focusin${EVENT_KEY}`, + FOCUSOUT : `focusout${EVENT_KEY}`, + MOUSEENTER : `mouseenter${EVENT_KEY}`, + MOUSELEAVE : `mouseleave${EVENT_KEY}` } @@ -88,6 +89,10 @@ const Popover = (($) => { return Event } + static get EVENT_KEY() { + return EVENT_KEY + } + // overrides diff --git a/js/src/scrollspy.js b/js/src/scrollspy.js index 763d133e8..d1be3a45f 100644 --- a/js/src/scrollspy.js +++ b/js/src/scrollspy.js @@ -20,6 +20,8 @@ const ScrollSpy = (($) => { const NAME = 'scrollspy' const VERSION = '4.0.0' const DATA_KEY = 'bs.scrollspy' + const EVENT_KEY = `.${DATA_KEY}` + const DATA_API_KEY = '.data-api' const JQUERY_NO_CONFLICT = $.fn[NAME] const Default = { @@ -27,9 +29,9 @@ const ScrollSpy = (($) => { } const Event = { - ACTIVATE : 'activate.bs.scrollspy', - SCROLL : 'scroll.bs.scrollspy', - LOAD : 'load.bs.scrollspy.data-api' + ACTIVATE : `activate${EVENT_KEY}`, + SCROLL : `scroll${EVENT_KEY}`, + LOAD_DATA_API : `load${EVENT_KEY}${DATA_API_KEY}` } const ClassName = { @@ -54,6 +56,7 @@ const ScrollSpy = (($) => { class ScrollSpy { constructor(element, config) { + this._element = element this._scrollElement = element.tagName === 'BODY' ? window : element this._config = $.extend({}, Default, config) this._selector = `${this._config.target || ''} .nav li > a` @@ -123,6 +126,20 @@ const ScrollSpy = (($) => { }) } + dispose() { + $.removeData(this._element, DATA_KEY) + $(this._scrollElement).off(EVENT_KEY) + + this._element = null + this._scrollElement = null + this._config = null + this._selector = null + this._offsets = null + this._targets = null + this._activeTarget = null + this._scrollHeight = null + } + // private @@ -244,7 +261,7 @@ const ScrollSpy = (($) => { * ------------------------------------------------------------------------ */ - $(window).on(Event.LOAD, function () { + $(window).on(Event.LOAD_DATA_API, function () { let scrollSpys = $.makeArray($(Selector.DATA_SPY)) for (let i = scrollSpys.length; i--;) { diff --git a/js/src/tab.js b/js/src/tab.js index f6b174ce2..61c062d89 100644 --- a/js/src/tab.js +++ b/js/src/tab.js @@ -20,15 +20,17 @@ const Tab = (($) => { const NAME = 'tab' const VERSION = '4.0.0' const DATA_KEY = 'bs.tab' + const EVENT_KEY = `.${DATA_KEY}` + const DATA_API_KEY = '.data-api' const JQUERY_NO_CONFLICT = $.fn[NAME] const TRANSITION_DURATION = 150 const Event = { - HIDE : 'hide.bs.tab', - HIDDEN : 'hidden.bs.tab', - SHOW : 'show.bs.tab', - SHOWN : 'shown.bs.tab', - CLICK : 'click.bs.tab.data-api' + HIDE : `hide${EVENT_KEY}`, + HIDDEN : `hidden${EVENT_KEY}`, + SHOW : `show${EVENT_KEY}`, + SHOWN : `shown${EVENT_KEY}`, + CLICK_DATA_API : `click${EVENT_KEY}${DATA_API_KEY}` } const ClassName = { @@ -146,6 +148,11 @@ const Tab = (($) => { } } + dispose() { + $.removeClass(this._element, DATA_KEY) + this._element = null + } + // private @@ -258,7 +265,7 @@ const Tab = (($) => { */ $(document) - .on(Event.CLICK, Selector.DATA_TOGGLE, function (event) { + .on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) { event.preventDefault() Tab._jQueryInterface.call($(this), 'show') }) diff --git a/js/src/tooltip.js b/js/src/tooltip.js index 1bd018c0f..42639895e 100644 --- a/js/src/tooltip.js +++ b/js/src/tooltip.js @@ -20,6 +20,7 @@ const Tooltip = (($) => { const NAME = 'tooltip' const VERSION = '4.0.0' const DATA_KEY = 'bs.tooltip' + const EVENT_KEY = `.${DATA_KEY}` const JQUERY_NO_CONFLICT = $.fn[NAME] const TRANSITION_DURATION = 150 const CLASS_PREFIX = 'bs-tether' @@ -52,16 +53,16 @@ const Tooltip = (($) => { } const Event = { - HIDE : 'hide.bs.tooltip', - HIDDEN : 'hidden.bs.tooltip', - SHOW : 'show.bs.tooltip', - SHOWN : 'shown.bs.tooltip', - INSERTED : 'inserted.bs.tooltip', - CLICK : 'click.bs.tooltip', - FOCUSIN : 'focusin.bs.tooltip', - FOCUSOUT : 'focusout.bs.tooltip', - MOUSEENTER : 'mouseenter.bs.tooltip', - MOUSELEAVE : 'mouseleave.bs.tooltip' + HIDE : `hide${EVENT_KEY}`, + HIDDEN : `hidden${EVENT_KEY}`, + SHOW : `show${EVENT_KEY}`, + SHOWN : `shown${EVENT_KEY}`, + INSERTED : `inserted${EVENT_KEY}`, + CLICK : `click${EVENT_KEY}`, + FOCUSIN : `focusin${EVENT_KEY}`, + FOCUSOUT : `focusout${EVENT_KEY}`, + MOUSEENTER : `mouseenter${EVENT_KEY}`, + MOUSELEAVE : `mouseleave${EVENT_KEY}` } const ClassName = { @@ -136,6 +137,9 @@ const Tooltip = (($) => { return Event } + static get EVENT_KEY() { + return EVENT_KEY + } // public @@ -182,19 +186,28 @@ const Tooltip = (($) => { } } - destroy() { + dispose() { clearTimeout(this._timeout) - this.hide(() => { - $(this.element) - .off(`.${this.constructor.NAME}`) - .removeData(this.constructor.DATA_KEY) - if (this.tip) { - $(this.tip).detach() - } + this.cleanupTether() - this.tip = null - }) + $.removeData(this.element, this.constructor.DATA_KEY) + + $(this.element).off(this.constructor.EVENT_KEY) + + if (this.tip) { + $(this.tip).remove() + } + + this._isEnabled = null + this._timeout = null + this._hoverState = null + this._activeTrigger = null + this._tether = null + + this.element = null + this.config = null + this.tip = null } show() { diff --git a/js/tests/unit/popover.js b/js/tests/unit/popover.js index 01c6a97cb..8347e9f03 100644 --- a/js/tests/unit/popover.js +++ b/js/tests/unit/popover.js @@ -179,7 +179,7 @@ $(function () { assert.strictEqual($._data($popover[0], 'events').click[0].namespace, 'foo', 'popover has extra click.foo event') $popover.bootstrapPopover('show') - $popover.bootstrapPopover('destroy') + $popover.bootstrapPopover('dispose') assert.ok(!$popover.hasClass('in'), 'popover is hidden') assert.ok(!$popover.data('popover'), 'popover does not have data') @@ -231,7 +231,7 @@ $(function () { $div .one('shown.bs.popover', function () { $('.content-with-handler .btn').trigger('click') - $div.bootstrapPopover('destroy') + $div.bootstrapPopover('dispose') assert.ok(handlerCalled, 'content\'s event handler still present') done() }) diff --git a/js/tests/unit/tooltip.js b/js/tests/unit/tooltip.js index 26c3224cf..f4deb29f8 100644 --- a/js/tests/unit/tooltip.js +++ b/js/tests/unit/tooltip.js @@ -250,7 +250,7 @@ $(function () { assert.strictEqual($._data($tooltip[0], 'events').click[0].namespace, 'foo', 'tooltip has extra click.foo event') $tooltip.bootstrapTooltip('show') - $tooltip.bootstrapTooltip('destroy') + $tooltip.bootstrapTooltip('dispose') assert.ok(!$tooltip.hasClass('in'), 'tooltip is hidden') assert.ok(!$._data($tooltip[0], 'bs.tooltip'), 'tooltip does not have data')