From 8d08b5cec24c88ac9ba251d2ee7614b05bf13d6f Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Fri, 7 Dec 2018 17:41:46 +0300
Subject: [PATCH] refactor Docs Module Script & Style Contributors

---
 ...eContributor.cs => AnchorJsScriptBundleContributor.cs} | 5 ++++-
 ...MalihuCustomScrollbarPluginScriptBundleContributor.cs} | 2 +-
 ... MalihuCustomScrollbarPluginStyleBundleContributor.cs} | 2 +-
 ...eContributor.cs => PopperJsScriptBundleContributor.cs} | 2 +-
 .../Volo.Docs.Web/Pages/Documents/Project/Index.cshtml    | 8 ++++----
 5 files changed, 11 insertions(+), 8 deletions(-)
 rename framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Anchor/{AnchorScriptBundleContributor.cs => AnchorJsScriptBundleContributor.cs} (64%)
 rename framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/MalihuCustomScrollbar/{MalihuCustomScrollbarScriptBundleContributor.cs => MalihuCustomScrollbarPluginScriptBundleContributor.cs} (82%)
 rename framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/MalihuCustomScrollbar/{MalihuCustomScrollbarStyleBundleContributor.cs => MalihuCustomScrollbarPluginStyleBundleContributor.cs} (82%)
 rename framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Popper/{PopperScriptBundleContributor.cs => PopperJsScriptBundleContributor.cs} (83%)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Anchor/AnchorScriptBundleContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Anchor/AnchorJsScriptBundleContributor.cs
similarity index 64%
rename from framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Anchor/AnchorScriptBundleContributor.cs
rename to framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Anchor/AnchorJsScriptBundleContributor.cs
index 7ca6f2d957..e08a0c555a 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Anchor/AnchorScriptBundleContributor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Anchor/AnchorJsScriptBundleContributor.cs
@@ -2,10 +2,13 @@
 using System.Collections.Generic;
 using System.Text;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages.JQuery;
+using Volo.Abp.Modularity;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Anchor
 {
-    public class AnchorScriptBundleContributor : BundleContributor
+    [DependsOn(typeof(JQueryScriptContributor))]
+    public class AnchorJsScriptBundleContributor : BundleContributor
     {
         public override void ConfigureBundle(BundleConfigurationContext context)
         {
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/MalihuCustomScrollbar/MalihuCustomScrollbarScriptBundleContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/MalihuCustomScrollbar/MalihuCustomScrollbarPluginScriptBundleContributor.cs
similarity index 82%
rename from framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/MalihuCustomScrollbar/MalihuCustomScrollbarScriptBundleContributor.cs
rename to framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/MalihuCustomScrollbar/MalihuCustomScrollbarPluginScriptBundleContributor.cs
index dc40e9f076..328299c36e 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/MalihuCustomScrollbar/MalihuCustomScrollbarScriptBundleContributor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/MalihuCustomScrollbar/MalihuCustomScrollbarPluginScriptBundleContributor.cs
@@ -5,7 +5,7 @@ using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.MalihuCustomScrollbar
 {
-    public class MalihuCustomScrollbarScriptBundleContributor : BundleContributor
+    public class MalihuCustomScrollbarPluginScriptBundleContributor : BundleContributor
     {
         public override void ConfigureBundle(BundleConfigurationContext context)
         {
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/MalihuCustomScrollbar/MalihuCustomScrollbarStyleBundleContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/MalihuCustomScrollbar/MalihuCustomScrollbarPluginStyleBundleContributor.cs
similarity index 82%
rename from framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/MalihuCustomScrollbar/MalihuCustomScrollbarStyleBundleContributor.cs
rename to framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/MalihuCustomScrollbar/MalihuCustomScrollbarPluginStyleBundleContributor.cs
index fba1166dd0..3bf00dba84 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/MalihuCustomScrollbar/MalihuCustomScrollbarStyleBundleContributor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/MalihuCustomScrollbar/MalihuCustomScrollbarPluginStyleBundleContributor.cs
@@ -5,7 +5,7 @@ using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.MalihuCustomScrollbar
 {
-    public class MalihuCustomScrollbarStyleBundleContributor : BundleContributor
+    public class MalihuCustomScrollbarPluginStyleBundleContributor : BundleContributor
     {
         public override void ConfigureBundle(BundleConfigurationContext context)
         {
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Popper/PopperScriptBundleContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Popper/PopperJsScriptBundleContributor.cs
similarity index 83%
rename from framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Popper/PopperScriptBundleContributor.cs
rename to framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Popper/PopperJsScriptBundleContributor.cs
index 96ad4fb22e..bc9a6c4a6d 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Popper/PopperScriptBundleContributor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Popper/PopperJsScriptBundleContributor.cs
@@ -5,7 +5,7 @@ using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Popper
 {
-    public class PopperScriptBundleContributor : BundleContributor
+    public class PopperJsScriptBundleContributor : BundleContributor
     {
         public override void ConfigureBundle(BundleConfigurationContext context)
         {
diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml
index c101b4e39a..29a6b786a6 100644
--- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml
+++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml
@@ -20,23 +20,23 @@
         <abp-style src="/libs/prismjs/themes/prism-okaidia.css" />
         <abp-style src="/libs/prismjs/plugins/line-highlight/prism-line-highlight.css" />
         <abp-style src="/libs/prismjs/plugins/toolbar/prism-toolbar.css" />
-        <abp-script type="@typeof(MalihuCustomScrollbarStyleBundleContributor)" />
+        <abp-script type="@typeof(MalihuCustomScrollbarPluginStyleBundleContributor)" />
         <abp-style src="/Pages/Documents/Shared/Styles/vs.css" />
         <abp-style src="/Pages/Documents/Project/bootstrap-toc.css" />
     </abp-style-bundle>
 }
 @section scripts {
     <abp-script-bundle name="@typeof(IndexModel).FullName">
-        <abp-script type="@typeof(MalihuCustomScrollbarScriptBundleContributor)" />
+        <abp-script type="@typeof(MalihuCustomScrollbarPluginScriptBundleContributor)" />
         <abp-script type="@typeof(ClipboardScriptBundleContributor)" />
-        <abp-script type="@typeof(AnchorScriptBundleContributor)" />
+        <abp-script type="@typeof(AnchorJsScriptBundleContributor)" />
         <abp-script src="/libs/prismjs/prism.js" />
         <abp-script src="/libs/prismjs/plugins/toolbar/prism-toolbar.js" />
         <abp-script src="/libs/prismjs/plugins/show-language/prism-show-language.js" />
         <abp-script src="/libs/prismjs/plugins/copy-to-clipboard/prism-copy-to-clipboard.js" />
         <abp-script src="/libs/prismjs/plugins/line-highlight/prism-line-highlight.js" />
         <abp-script src="/libs/prismjs/components/prism-csharp.js" />
-        <abp-script type="@typeof(PopperScriptBundleContributor)" />
+        <abp-script type="@typeof(PopperJsScriptBundleContributor)" />
         <abp-script src="/Pages/Documents/Project/bootstrap-toc.js" />
         <abp-script src="/Pages/Documents/Shared/Scripts/vs.js" />
         <abp-script src="/Pages/Documents/Project/index.js" />