From 1a6fdfae6be09b09eaced8f0e442ca6f7680a61e Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 9 Oct 2021 09:33:12 +0300 Subject: Bump version to 5.1.3. --- js/src/popover.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/src/popover.js') diff --git a/js/src/popover.js b/js/src/popover.js index d499bedf1..aa9b0bc9e 100644 --- a/js/src/popover.js +++ b/js/src/popover.js @@ -1,6 +1,6 @@ /** * -------------------------------------------------------------------------- - * Bootstrap (v5.1.2): popover.js + * Bootstrap (v5.1.3): popover.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) * -------------------------------------------------------------------------- */ -- cgit v1.2.3 From e8f702666f285a3e69866ed1f8d29fa6eaaaeabb Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 13 Oct 2021 15:19:28 +0300 Subject: JS: minor refactoring (#35183) * add missing comments * shorten block comments * reorder constants * reorder public/private methods * sort exports alphabetically in util/index.js * fix a couple of typos --- js/src/popover.js | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'js/src/popover.js') diff --git a/js/src/popover.js b/js/src/popover.js index aa9b0bc9e..144ec1cad 100644 --- a/js/src/popover.js +++ b/js/src/popover.js @@ -9,9 +9,7 @@ import { defineJQueryPlugin } from './util/index' import Tooltip from './tooltip' /** - * ------------------------------------------------------------------------ * Constants - * ------------------------------------------------------------------------ */ const NAME = 'popover' @@ -19,6 +17,9 @@ const DATA_KEY = 'bs.popover' const EVENT_KEY = `.${DATA_KEY}` const CLASS_PREFIX = 'bs-popover' +const SELECTOR_TITLE = '.popover-header' +const SELECTOR_CONTENT = '.popover-body' + const Default = { ...Tooltip.Default, placement: 'right', @@ -50,18 +51,12 @@ const Event = { MOUSELEAVE: `mouseleave${EVENT_KEY}` } -const SELECTOR_TITLE = '.popover-header' -const SELECTOR_CONTENT = '.popover-body' - /** - * ------------------------------------------------------------------------ - * Class Definition - * ------------------------------------------------------------------------ + * Class definition */ class Popover extends Tooltip { // Getters - static get Default() { return Default } @@ -79,7 +74,6 @@ class Popover extends Tooltip { } // Overrides - isWithContent() { return this.getTitle() || this._getContent() } @@ -90,7 +84,6 @@ class Popover extends Tooltip { } // Private - _getContent() { return this._resolvePossibleFunction(this._config.content) } @@ -100,7 +93,6 @@ class Popover extends Tooltip { } // Static - static jQueryInterface(config) { return this.each(function () { const data = Popover.getOrCreateInstance(this, config) @@ -117,10 +109,7 @@ class Popover extends Tooltip { } /** - * ------------------------------------------------------------------------ * jQuery - * ------------------------------------------------------------------------ - * add .Popover to jQuery only if jQuery is present */ defineJQueryPlugin(Popover) -- cgit v1.2.3 From 94a596fbcb1011ba990da2078ba7e20b39dba2d9 Mon Sep 17 00:00:00 2001 From: GeoSot Date: Thu, 25 Nov 2021 19:14:02 +0200 Subject: Add a template factory helper to handle all template cases (#34519) Co-authored-by: XhmikosR --- js/src/popover.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'js/src/popover.js') diff --git a/js/src/popover.js b/js/src/popover.js index 144ec1cad..0b255a585 100644 --- a/js/src/popover.js +++ b/js/src/popover.js @@ -78,12 +78,14 @@ class Popover extends Tooltip { return this.getTitle() || this._getContent() } - setContent(tip) { - this._sanitizeAndSetContent(tip, this.getTitle(), SELECTOR_TITLE) - this._sanitizeAndSetContent(tip, this._getContent(), SELECTOR_CONTENT) + // Private + _getContentForTemplate() { + return { + [SELECTOR_TITLE]: this.getTitle(), + [SELECTOR_CONTENT]: this._getContent() + } } - // Private _getContent() { return this._resolvePossibleFunction(this._config.content) } -- cgit v1.2.3 From 6f077ff7bcf5c3e8a9cd579e26a2325ce32543c9 Mon Sep 17 00:00:00 2001 From: GeoSot Date: Thu, 25 Nov 2021 20:08:11 +0200 Subject: Clean tooltip component unneeded functionality (#32692) --- js/src/popover.js | 5 ----- 1 file changed, 5 deletions(-) (limited to 'js/src/popover.js') diff --git a/js/src/popover.js b/js/src/popover.js index 0b255a585..19c1e42a4 100644 --- a/js/src/popover.js +++ b/js/src/popover.js @@ -15,7 +15,6 @@ import Tooltip from './tooltip' const NAME = 'popover' const DATA_KEY = 'bs.popover' const EVENT_KEY = `.${DATA_KEY}` -const CLASS_PREFIX = 'bs-popover' const SELECTOR_TITLE = '.popover-header' const SELECTOR_CONTENT = '.popover-body' @@ -90,10 +89,6 @@ class Popover extends Tooltip { return this._resolvePossibleFunction(this._config.content) } - _getBasicClassPrefix() { - return CLASS_PREFIX - } - // Static static jQueryInterface(config) { return this.each(function () { -- cgit v1.2.3