Merge pull request #17002 from abpframework/auto-merge/rel-7-1/2045

Merge branch rel-7.2 with rel-7.1

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Bootstrap/BootstrapScriptContributor.cs

@@ -11,11 +11,5 @@ public class BootstrapScriptContributor : BundleContributor
     public override void ConfigureBundle(BundleConfigurationContext context)
     {
         context.Files.AddIfNotContains("/libs/bootstrap/js/bootstrap.bundle.js");
-        context.Files.AddIfNotContains("/libs/bootstrap/js/bootstrap.enable.tooltips.everywhere.js");
-
-        if (context.FileProvider.GetFileInfo("/libs/bootstrap/js/bootstrap.enable.popovers.everywhere.js").Exists)
-        {
-            context.Files.AddIfNotContains("/libs/bootstrap/js/bootstrap.enable.popovers.everywhere.js");
-        }
     }
 }

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js

@@ -56,15 +56,19 @@
     }
 
     abp.dom.initializers.initializeToolTips = function ($tooltips) {
-        $tooltips.tooltip({
+        for (var i = 0; i < $tooltips.length; i++) {
-            container: 'body'
+            new bootstrap.Tooltip($tooltips[i], {
-        });
+                container: `body`
+              });
+        }
     }
 
     abp.dom.initializers.initializePopovers = function ($popovers) {
-        $popovers.popover({
+        for (var i = 0; i < $popovers.length; i++) {
-            container: 'body'
+            new bootstrap.Popover($popovers[i], {
-        });
+                container: `body`
+              });
+        }
     }
 
     abp.dom.initializers.initializeTimeAgos = function ($timeagos) {
@@ -754,8 +758,8 @@
     }
 
     abp.dom.onNodeAdded(function (args) {
-        abp.dom.initializers.initializeToolTips(args.$el.findWithSelf('[data-toggle="tooltip"]'));
+        abp.dom.initializers.initializeToolTips(args.$el.findWithSelf('[data-bs-toggle="tooltip"]'));
-        abp.dom.initializers.initializePopovers(args.$el.findWithSelf('[data-toggle="popover"]'));
+        abp.dom.initializers.initializePopovers(args.$el.findWithSelf('[data-bs-toggle="popover"]'));
         abp.dom.initializers.initializeTimeAgos(args.$el.findWithSelf('.timeago'));
         abp.dom.initializers.initializeForms(args.$el.findWithSelf('form'), true);
         abp.dom.initializers.initializeScript(args.$el);
@@ -764,7 +768,7 @@
     });
 
     abp.dom.onNodeRemoved(function (args) {
-        args.$el.findWithSelf('[data-toggle="tooltip"]').each(function () {
+        args.$el.findWithSelf('[data-bs-toggle="tooltip"]').each(function () {
             $('#' + $(this).attr('aria-describedby')).remove();
         });
     });
@@ -775,8 +779,8 @@
     
 
     $(function () {
-        abp.dom.initializers.initializeToolTips($('[data-toggle="tooltip"]'));
+        abp.dom.initializers.initializeToolTips($('[data-bs-toggle="tooltip"]'));
-        abp.dom.initializers.initializePopovers($('[data-toggle="popover"]'));
+        abp.dom.initializers.initializePopovers($('[data-bs-toggle="popover"]'));
         abp.dom.initializers.initializeTimeAgos($('.timeago'));
         abp.dom.initializers.initializeDatepickers($(document));
         abp.dom.initializers.initializeDateRangePickers($(document));

npm/packs/bootstrap/src/bootstrap.enable.popovers.everywhere.js

@@ -1,5 +0,0 @@
-(function () {
-    [].slice.call(document.querySelectorAll('[data-bs-toggle="popover"]')).map(function (popoverTriggerEl) {
-      return new bootstrap.Popover(popoverTriggerEl)
-    })
-})();

npm/packs/bootstrap/src/bootstrap.enable.tooltips.everywhere.js

@@ -1,5 +0,0 @@
-(function () {
-    [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]')).map(function (tooltipTriggerEl) {
-        return new bootstrap.Tooltip(tooltipTriggerEl)
-    });
-})();