Moving jQuery utilities to subfolders

src/Orchard.Web/Modules/Orchard.Resources/Assets.json

@@ -1,15 +1,15 @@
 [
     {
-        "inputs": [ "Assets/Js/jQuery/jquery.utils.js" ],
-        "output": "Scripts/jquery.utils.js"
+        "inputs": [ "Assets/Js/jQuery.Utilities/jquery.utils.js" ],
+        "output": "Scripts/jQuery.Utilities/jquery.utils.js"
     },
     {
-        "inputs": [ "Assets/Js/jQuery/jquery.plugin.js" ],
-        "output": "Scripts/jquery.plugin.js"
+        "inputs": [ "Assets/Js/jQuery.Utilities/jquery.plugin.js" ],
+        "output": "Scripts/jQuery.Utilities/jquery.plugin.js"
     },
     {
-        "inputs": [ "Assets/Js/jQuery/jquery.cookie.js" ],
-        "output": "Scripts/jquery.cookie.js"
+        "inputs": [ "Assets/Js/jQuery.Utilities/jquery.cookie.js" ],
+        "output": "Scripts/jQuery.Utilities/jquery.cookie.js"
     },
     {
         "inputs": [ "Assets/Js/FileUpload/jquery.iframe-transport.js" ],

src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj

@@ -306,10 +306,10 @@
     <Content Include="Assets\Js\FileUpload\jquery.fileupload-validate.js" />
     <Content Include="Assets\Js\FileUpload\jquery.fileupload.js" />
     <Content Include="Assets\Js\History\history.js" />
-    <Content Include="Assets\Js\jQuery\jquery.cookie.js" />
+    <Content Include="Assets\Js\jQuery.Utilities\jquery.cookie.js" />
     <Content Include="Assets\Js\FileUpload\jquery.iframe-transport.js" />
-    <Content Include="Assets\Js\jQuery\jquery.plugin.js" />
-    <Content Include="Assets\Js\jQuery\jquery.utils.js" />
+    <Content Include="Assets\Js\jQuery.Utilities\jquery.plugin.js" />
+    <Content Include="Assets\Js\jQuery.Utilities\jquery.utils.js" />
     <Content Include="Assets\Js\Knockout\knockout-3.4.0.js" />
     <Content Include="Assets\Js\Moment\moment.js" />
     <Content Include="Assets\Js\TimeEntry\jquery.timeentry-ar.js" />
@@ -753,16 +753,16 @@
     <Content Include="Scripts\jQuery.BlockUI\jquery.blockui.min.js" />
     <Content Include="Scripts\jQuery.Colorbox\jquery.colorbox.js" />
     <Content Include="Scripts\jQuery.Colorbox\jquery.colorbox.min.js" />
-    <Content Include="Scripts\jquery.cookie.js" />
-    <Content Include="Scripts\jquery.cookie.min.js" />
+    <Content Include="Scripts\jQuery.Utilities\jquery.cookie.js" />
+    <Content Include="Scripts\jQuery.Utilities\jquery.cookie.min.js" />
     <Content Include="Scripts\jquery.fileupload-full.js" />
     <Content Include="Scripts\jquery.fileupload-full.min.js" />
     <Content Include="Scripts\jquery.iframe-transport.js" />
     <Content Include="Scripts\jquery.iframe-transport.min.js" />
-    <Content Include="Scripts\jquery.plugin.js" />
-    <Content Include="Scripts\jquery.plugin.min.js" />
-    <Content Include="Scripts\jquery.utils.js" />
-    <Content Include="Scripts\jquery.utils.min.js" />
+    <Content Include="Scripts\jQuery.Utilities\jquery.plugin.js" />
+    <Content Include="Scripts\jQuery.Utilities\jquery.plugin.min.js" />
+    <Content Include="Scripts\jQuery.Utilities\jquery.utils.js" />
+    <Content Include="Scripts\jQuery.Utilities\jquery.utils.min.js" />
     <Content Include="Scripts\jQuery\jquery.js" />
     <Content Include="Scripts\jQuery\jquery.min.js" />
     <Content Include="Scripts\knockout.js" />
@@ -963,6 +963,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ResourceManifests\jQueryUtilities.cs" />
     <Compile Include="ResourceManifests\jQueryUI.cs" />
     <Compile Include="ResourceManifests\Uri.cs" />
     <Compile Include="ResourceManifests\jQueryBlockUI.cs" />

src/Orchard.Web/Modules/Orchard.Resources/ResourceManifests/jQueryUI.cs

@@ -35,18 +35,6 @@ namespace Orchard.Resources.ResourceManifests {
             // Right now no customization in the styles, but the resource might be used later.
             manifest.DefineStyle("jQueryUI_Orchard").SetDependencies("jQueryUI_Full");
 
-            // Additional utilities and plugins.
-            manifest.DefineScript("jQueryUtils")
-                .SetUrl("jquery.utils.min.js", "jquery.utils.js")
-                .SetDependencies("jQuery");
-            manifest.DefineScript("jQueryPlugin")
-                .SetUrl("jquery.plugin.min.js", "jquery.plugin.js")
-                .SetDependencies("jQuery");
-            manifest.DefineScript("jQueryCookie") // jQuery Cookie.
-                .SetUrl("jquery.cookie.min.js", "jquery.cookie.js")
-                .SetVersion("1.4.1")
-                .SetDependencies("jQuery");
-
             // jQuery Calendars.
             manifest.DefineScript("jQueryCalendars")
                 .SetUrl("Calendars/jquery.calendars.all.min.js", "Calendars/jquery.calendars.all.js")

src/Orchard.Web/Modules/Orchard.Resources/ResourceManifests/jQueryUtilities.cs

@@ -0,0 +1,23 @@
+using Orchard.UI.Resources;
+
+namespace Orchard.Resources.ResourceManifests {
+    public class jQueryUtilities : IResourceManifestProvider {
+        public void BuildManifests(ResourceManifestBuilder builder) {
+            var manifest = builder.Add();
+
+            manifest.DefineScript("jQueryUtils")
+                .SetUrl("jQuery.Utilities/jquery.utils.min.js", "jQuery.Utilities/jquery.utils.js")
+                .SetVersion("0.8.5")
+                .SetDependencies("jQuery");
+
+            manifest.DefineScript("jQueryPlugin")
+                .SetUrl("jQuery.Utilities/jquery.plugin.min.js", "jQuery.Utilities/jquery.plugin.js")
+                .SetDependencies("jQuery");
+
+            manifest.DefineScript("jQueryCookie")
+                .SetUrl("jQuery.Utilities/jquery.cookie.min.js", "jQuery.Utilities/jquery.cookie.js")
+                .SetVersion("1.4.1")
+                .SetDependencies("jQuery");
+        }
+    }
+}