Merge pull request #1310 from abpframework/Depend-on-malihu-custom-scrollbar-plugin-from-the-shared-theme-module

Depend on malihu-custom-scrollbar-plugin from the shared theme module

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalScriptContributor.cs

@@ -5,6 +5,7 @@ using Volo.Abp.AspNetCore.Mvc.UI.Packages.JQuery;
 using Volo.Abp.AspNetCore.Mvc.UI.Packages.JQueryForm;
 using Volo.Abp.AspNetCore.Mvc.UI.Packages.JQueryValidationUnobtrusive;
 using Volo.Abp.AspNetCore.Mvc.UI.Packages.Lodash;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.MalihuCustomScrollbar;
 using Volo.Abp.AspNetCore.Mvc.UI.Packages.Select2;
 using Volo.Abp.AspNetCore.Mvc.UI.Packages.SweetAlert;
 using Volo.Abp.AspNetCore.Mvc.UI.Packages.Timeago;
@@ -23,6 +24,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Bundling
         typeof(DatatablesNetBs4ScriptContributor),
         typeof(SweetalertScriptContributor),
         typeof(ToastrScriptBundleContributor),
+        typeof(MalihuCustomScrollbarPluginScriptBundleContributor),
         typeof(TimeagoScriptContributor)
         )]
     public class SharedThemeGlobalScriptContributor : BundleContributor
@@ -37,7 +39,8 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Bundling
                 "/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/modal-manager.js",
                 "/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js",
                 "/libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert/abp-sweetalert.js",
-                "/libs/abp/aspnetcore-mvc-ui-theme-shared/toastr/abp-toastr.js"
+                "/libs/abp/aspnetcore-mvc-ui-theme-shared/toastr/abp-toastr.js",
+                "/libs/abp/aspnetcore-mvc-ui-theme-shared/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.concat.min.js"
             });
         }
     }

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalStyleContributor.cs

@@ -3,6 +3,7 @@ using Volo.Abp.AspNetCore.Mvc.UI.Packages.Bootstrap;
 using Volo.Abp.AspNetCore.Mvc.UI.Packages.Core;
 using Volo.Abp.AspNetCore.Mvc.UI.Packages.DatatablesNetBs4;
 using Volo.Abp.AspNetCore.Mvc.UI.Packages.FontAwesome;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.MalihuCustomScrollbar;
 using Volo.Abp.AspNetCore.Mvc.UI.Packages.Select2;
 using Volo.Abp.AspNetCore.Mvc.UI.Packages.Toastr;
 using Volo.Abp.Modularity;
@@ -15,6 +16,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Bundling
         typeof(FontAwesomeStyleContributor),
         typeof(ToastrStyleBundleContributor),
         typeof(Select2StyleContributor),
+        typeof(MalihuCustomScrollbarPluginStyleBundleContributor),
         typeof(DatatablesNetBs4StyleContributor)
     )]
     public class SharedThemeGlobalStyleContributor : BundleContributor

npm/packs/aspnetcore.mvc.ui.theme.shared/package.json

@@ -15,7 +15,8 @@
     "@abp/select2": "^0.6.5",
     "@abp/sweetalert": "^0.6.5",
     "@abp/timeago": "^0.6.5",
-    "@abp/toastr": "^0.6.5"
+    "@abp/toastr": "^0.6.5",
+    "@abp/malihu-custom-scrollbar-plugin": "^0.6.5"
   },
   "gitHead": "2e846ad3e5a8cbe04100484865335fbcd845a342"
 }