From 8dc85c657ee8353f76bb767737f489457132e29d Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 24 Nov 2020 16:37:20 +0200 Subject: Prepare v5.0.0-beta1. --- js/src/button.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/src/button.js') diff --git a/js/src/button.js b/js/src/button.js index 240995564..b50f4c7a2 100644 --- a/js/src/button.js +++ b/js/src/button.js @@ -1,6 +1,6 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v5.0.0-alpha3): button.js + * Bootstrap (v5.0.0-beta1): button.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) * -------------------------------------------------------------------------- */ -- cgit v1.2.3 From 85208ae5570aeefe4e94c1ceb29ca3b6ffdf83a1 Mon Sep 17 00:00:00 2001 From: alpadev <2838324+alpadev@users.noreply.github.com> Date: Tue, 8 Dec 2020 07:16:50 +0100 Subject: Refactor components to use a utility function to define jQuery plugins (#32285) * refactor: use an utility function to define jQuery plugins * test: add spec for defineJQueryPlugin utility function * Update .bundlewatch.config.json Co-authored-by: XhmikosR --- js/src/button.js | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'js/src/button.js') diff --git a/js/src/button.js b/js/src/button.js index b50f4c7a2..e0f74b065 100644 --- a/js/src/button.js +++ b/js/src/button.js @@ -5,7 +5,7 @@ * -------------------------------------------------------------------------- */ -import { getjQuery, onDOMContentLoaded } from './util/index' +import { defineJQueryPlugin } from './util/index' import Data from './dom/data' import EventHandler from './dom/event-handler' import BaseComponent from './base-component' @@ -90,19 +90,6 @@ EventHandler.on(document, EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE, event => { * add .Button to jQuery only if jQuery is present */ -onDOMContentLoaded(() => { - const $ = getjQuery() - /* istanbul ignore if */ - if ($) { - const JQUERY_NO_CONFLICT = $.fn[NAME] - $.fn[NAME] = Button.jQueryInterface - $.fn[NAME].Constructor = Button - - $.fn[NAME].noConflict = () => { - $.fn[NAME] = JQUERY_NO_CONFLICT - return Button.jQueryInterface - } - } -}) +defineJQueryPlugin(NAME, Button) export default Button -- cgit v1.2.3 From e50c11b8c6434b6d68ea5897771e4d35fe12f5c3 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 10 Feb 2021 18:14:51 +0200 Subject: Release v5.0.0-beta2 (#32467) * Bump version to 5.0.0-beta2 * Dist --- js/src/button.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/src/button.js') diff --git a/js/src/button.js b/js/src/button.js index e0f74b065..4ec48ca08 100644 --- a/js/src/button.js +++ b/js/src/button.js @@ -1,6 +1,6 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v5.0.0-beta1): button.js + * Bootstrap (v5.0.0-beta2): button.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) * -------------------------------------------------------------------------- */ -- cgit v1.2.3 From 48a95f7280735d6f8962fe8b17975b03e351710c Mon Sep 17 00:00:00 2001 From: alpadev <2838324+alpadev@users.noreply.github.com> Date: Tue, 2 Mar 2021 15:55:44 +0100 Subject: refactor: use a Map instead of an Object in dom/data (#32180) Co-authored-by: XhmikosR Co-authored-by: Rohit Sharma --- js/src/button.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/src/button.js') diff --git a/js/src/button.js b/js/src/button.js index 4ec48ca08..7a9449f07 100644 --- a/js/src/button.js +++ b/js/src/button.js @@ -51,7 +51,7 @@ class Button extends BaseComponent { static jQueryInterface(config) { return this.each(function () { - let data = Data.getData(this, DATA_KEY) + let data = Data.get(this, DATA_KEY) if (!data) { data = new Button(this) @@ -75,7 +75,7 @@ EventHandler.on(document, EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE, event => { const button = event.target.closest(SELECTOR_DATA_TOGGLE) - let data = Data.getData(button, DATA_KEY) + let data = Data.get(button, DATA_KEY) if (!data) { data = new Button(button) } -- cgit v1.2.3 From 220139a89ffc3864bbb6e1b35471667318eadc1f Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 23 Mar 2021 18:26:54 +0200 Subject: Release v5.0.0-beta3 (#33439) --- js/src/button.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/src/button.js') diff --git a/js/src/button.js b/js/src/button.js index 7a9449f07..093679e90 100644 --- a/js/src/button.js +++ b/js/src/button.js @@ -1,6 +1,6 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v5.0.0-beta2): button.js + * Bootstrap (v5.0.0-beta3): button.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) * -------------------------------------------------------------------------- */ -- cgit v1.2.3