From 4ac334e4413f29bab0e81662d57a6405d4b8bd88 Mon Sep 17 00:00:00 2001 From: Khaled Date: Wed, 6 Oct 2021 00:53:45 -0600 Subject: [PATCH 1/2] add support for Bootstrap 5 This change adds support to Bootstrap 5 (in addition to the existing support for Bootstrap 4). The attribute names (1) 'data-toggle' and 'data-bs-toggle' as well as (2) 'data-target' and 'data-bs-target' are supported based on the version of Bootstrap used. --- src/js/bstreeview.js | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/js/bstreeview.js b/src/js/bstreeview.js index ad3a088..6a4387f 100644 --- a/src/js/bstreeview.js +++ b/src/js/bstreeview.js @@ -1,6 +1,6 @@ /*! @preserve * bstreeview.js - * Version: 1.2.0 + * Version: 1.3.0 * Authors: Sami CHNITER * Copyright 2020 * License: Apache License 2.0 @@ -21,12 +21,28 @@ openNodeLinkOnNewTab: true }; + /** + * Define Bootstrap 4 attributes + */ + let dataToggleAttr = 'data-toggle'; + let dataTargetAttr = 'data-target'; + /** + * get Bootstrap version + */ + let bootstrapVersion = (bootstrap.Tooltip.VERSION).charAt(0); + /** + * If Bootstrap 5, redefine attributes + */ + if (bootstrapVersion === '5') { + dataToggleAttr = 'data-bs-toggle'; + dataTargetAttr = 'data-bs-target'; + } /** * bstreeview HTML templates. */ var templates = { treeview: '
', - treeviewItem: '
', + treeviewItem: '
', treeviewGroupItem: '
', treeviewItemStateIcon: '', treeviewItemIcon: '' @@ -120,7 +136,7 @@ $.each(nodes, function addNodes(id, node) { // Main node element. var treeItem = $(templates.treeviewItem) - .attr('data-target', "#" + _this.itemIdPrefix + node.nodeId) + .attr(dataTargetAttr, "#" + _this.itemIdPrefix + node.nodeId) .attr('style', 'padding-left:' + leftPadding) .attr('aria-level', depth); // Set Expand and Collapse icones. From 0aeb5a91028d64b27240b252e1ddcc4bba530836 Mon Sep 17 00:00:00 2001 From: Khaled Date: Sat, 9 Oct 2021 17:56:42 -0600 Subject: [PATCH 2/2] Update bstreeview.js --- src/js/bstreeview.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/bstreeview.js b/src/js/bstreeview.js index 6a4387f..2415790 100644 --- a/src/js/bstreeview.js +++ b/src/js/bstreeview.js @@ -1,6 +1,6 @@ /*! @preserve * bstreeview.js - * Version: 1.3.0 + * Version: 1.2.0 * Authors: Sami CHNITER * Copyright 2020 * License: Apache License 2.0