diff options
| author | Techywarrior <techywarrior@gmail.com> | 2013-05-15 18:50:49 -0700 |
|---|---|---|
| committer | Techywarrior <techywarrior@gmail.com> | 2013-05-15 18:50:49 -0700 |
| commit | 73e256e9109dd3fc37d90660b46ee2bd3c387be4 (patch) | |
| tree | 4a16a17387768ea9a3b0892e9b5cb3006be0cffc | |
| parent | 56836ed00494b4adcadf7e08a304047b9de1aaa3 (diff) | |
upgrade to videoJS 4.0
| -rw-r--r-- | MediaBrowser.WebDashboard/Api/DashboardService.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj | 24 |
2 files changed, 27 insertions, 3 deletions
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs index 683ecda97..b90553e2e 100644 --- a/MediaBrowser.WebDashboard/Api/DashboardService.cs +++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs @@ -409,8 +409,8 @@ namespace MediaBrowser.WebDashboard.Api var files = new[] { "http://code.jquery.com/mobile/1.3.1/jquery.mobile-1.3.1.min.css", - "thirdparty/video-js-3.2.0/video-js.min.css", - "thirdparty/video-js-3.2.0/video-js.tube.min.css", + "thirdparty/video-js-4.0/video-js.min.css", + "thirdparty/video-js-4.0/video-js.tube.min.css", "thirdparty/jqm-icon-pack-3.0/font-awesome/jqm-icon-pack-3.0.0-fa.css", "css/all.css" + versionString }; @@ -519,7 +519,7 @@ namespace MediaBrowser.WebDashboard.Api var newLineBytes = Encoding.UTF8.GetBytes(Environment.NewLine); - await AppendResource(memoryStream, "thirdparty/video-js-3.2.0/video.min.js", newLineBytes).ConfigureAwait(false); + await AppendResource(memoryStream, "thirdparty/video-js-4.0/video.min.js", newLineBytes).ConfigureAwait(false); await AppendResource(memoryStream, "thirdparty/autoNumeric.js", newLineBytes).ConfigureAwait(false); await AppendResource(assembly, memoryStream, "MediaBrowser.WebDashboard.ApiClient.js", newLineBytes).ConfigureAwait(false); diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index d29f0e8a7..dbf0e90e2 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -446,6 +446,27 @@ <Content Include="dashboard-ui\thirdparty\video-js-3.2.0\video.min.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <Content Include="dashboard-ui\thirdparty\video-js-4.0\demo.html">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="dashboard-ui\thirdparty\video-js-4.0\tubesprite.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="dashboard-ui\thirdparty\video-js-4.0\video-js.css">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="dashboard-ui\thirdparty\video-js-4.0\video-js.swf">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="dashboard-ui\thirdparty\video-js-4.0\video-js.tube.min.css">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="dashboard-ui\thirdparty\video-js-4.0\video.dev.js">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="dashboard-ui\thirdparty\video-js-4.0\video.js">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
<Content Include="dashboard-ui\tvgenres.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@@ -988,6 +1009,9 @@ <None Include="dashboard-ui\thirdparty\video-js-3.2.0\captions.vtt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
+ <None Include="dashboard-ui\thirdparty\video-js-4.0\demo.captions.vtt">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup />
|