Added Uri.

src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Module.txt

@@ -10,4 +10,4 @@ Features:
         Name: Microsoft Azure Media Services
         Description: Provides integration of Microsoft Azure Media Services functionality into Orchard.
         Category: Hosting
-        Dependencies: Orchard.MediaLibrary, Orchard.PublishLater, Orchard.TaskLease, Orchard.Resources.jQuery, Orchard.TaskLease, Orchard.Resources.Knockout, Orchard.TaskLease, Orchard.Resources.Moment, Orchard.TaskLease, Orchard.Resources.Underscore, Orchard.Resources.BlockUI
+        Dependencies: Orchard.MediaLibrary, Orchard.PublishLater, Orchard.TaskLease, Orchard.Resources.jQuery, Orchard.TaskLease, Orchard.Resources.Knockout, Orchard.TaskLease, Orchard.Resources.Moment, Orchard.TaskLease, Orchard.Resources.Underscore, Orchard.Resources.BlockUI, Orchard.Resources.Uri

src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj

@@ -213,22 +213,14 @@
     <Content Include="Assets\TypeScript\cloudmedia-metadata-cloudvideopart.ts" />
     <Content Include="Assets\JavaScript\Lib\jstree.js" />
     <Content Include="Assets\JavaScript\Lib\swfobject.js" />
-    <Content Include="Assets\JavaScript\Lib\uri.js" />
-    <Content Include="Assets\JavaScript\Lib\underscore.js" />
     <Content Include="Scripts\Lib\console-shim.js" />
     <Content Include="Scripts\Lib\console-shim.min.js" />
     <Content Include="Scripts\Lib\dash.all.js" />
     <Content Include="Scripts\Lib\dash.all.min.js" />
-    <Content Include="Scripts\Lib\jquery.blockUI.js" />
-    <Content Include="Scripts\Lib\jquery.blockUI.min.js" />
     <Content Include="Scripts\Lib\jstree.js" />
     <Content Include="Scripts\Lib\jstree.min.js" />
     <Content Include="Scripts\Lib\swfobject.js" />
     <Content Include="Scripts\Lib\swfobject.min.js" />
-    <Content Include="Scripts\Lib\underscore.js" />
-    <Content Include="Scripts\Lib\underscore.min.js" />
-    <Content Include="Scripts\Lib\uri.js" />
-    <Content Include="Scripts\Lib\uri.min.js" />
     <Content Include="Styles\cloudmedia-admin-asset.css" />
     <Content Include="Styles\cloudmedia-admin-asset.min.css" />
     <Content Include="Styles\cloudmedia-admin-job.css" />

src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Views/CloudVideoPlayer.cshtml

@@ -9,7 +9,7 @@
     Script.Require("JQuery").AtFoot();    
     Script.Include("Lib/swfobject.js", "Lib/swfobject.min.js").AtFoot();
     Script.Include("Lib/dash.all.js", "Lib/dash.all.min.js").AtFoot();
-    Script.Include("Lib/uri.js", "Lib/uri.min.js").AtFoot();
+    Script.Require("Uri").AtFoot();
     Script.Require("Underscore").AtFoot();
     Script.Require("Moment").AtFoot();
     Script.Include("Lib/console-shim.js", "Lib/console-shim.min.js").AtFoot();

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

@@ -283,5 +283,9 @@
     {
         "inputs": [ "Assets/Js/BlockUI/jquery.blockui.js" ],
         "output": "Scripts/jquery.blockui.js"
+    },
+    {
+        "inputs": [ "Assets/Js/Uri/uri.js" ],
+        "output": "Scripts/uri.js"
     }
 ]

src/Orchard.Web/Modules/Orchard.Resources/Module.txt

@@ -54,4 +54,9 @@ Features:
         Name: Moment Resources
         Description: Provides the BlockUI script library.
         Category: Core
-        Dependencies: Orchard.Resources, Orchard.Resources.jQuery
+        Dependencies: Orchard.Resources, Orchard.Resources.jQuery
+    Orchard.Resources.Uri:
+        Name: Uri Resources
+        Description: Provides the Uri script library.
+        Category: Core
+        Dependencies: Orchard.Resources

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

@@ -473,6 +473,7 @@
     <Content Include="Assets\Js\TimeEntry\jquery.timeentry-zh-TW.js" />
     <Content Include="Assets\Js\TimeEntry\jquery.timeentry.js" />
     <Content Include="Assets\Js\Underscore\underscore.js" />
+    <Content Include="Assets\Js\Uri\uri.js" />
     <Content Include="Scripts\angular-resource.js" />
     <Content Include="Scripts\angular-resource.min.js" />
     <Content Include="Scripts\angular-sanitize.js" />
@@ -557,6 +558,8 @@
     <Content Include="Scripts\ui\tooltip.min.js" />
     <Content Include="Scripts\underscore.js" />
     <Content Include="Scripts\underscore.min.js" />
+    <Content Include="Scripts\uri.js" />
+    <Content Include="Scripts\uri.min.js" />
     <Content Include="Styles\bootstrap.css" />
     <Content Include="Styles\bootstrap.min.css" />
     <Content Include="Styles\font-awesome.css" />
@@ -619,6 +622,7 @@
     <Folder Include="Models\" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Uri.cs" />
     <Compile Include="BlockUI.cs" />
     <Compile Include="Moment.cs" />
     <Compile Include="Knockout.cs" />

src/Orchard.Web/Modules/Orchard.Resources/Uri.cs

@@ -0,0 +1,12 @@
+using Orchard.Environment.Extensions;
+using Orchard.UI.Resources;
+
+namespace Orchard.Resources {
+    [OrchardFeature("Orchard.Resources.Uri")]
+    public class Uri : IResourceManifestProvider {
+        public void BuildManifests(ResourceManifestBuilder builder) {
+            var manifest = builder.Add();
+            manifest.DefineScript("Uri").SetUrl("uri.min.js", "uri.js").SetVersion("1.16.1");
+        }
+    }
+}