Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-11-03 19:17:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

upgrade to videoJS 4.0

Browse Source
This commit is contained in:
Techywarrior 2013-05-15 18:50:49 -07:00
parent 56836ed004
commit 73e256e910
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.WebDashboard/Api/DashboardService.cs
View File

@ -409,8 +409,8 @@ namespace MediaBrowser.WebDashboard.Api
var files = new[] var files = new[]
{ {
"http://code.jquery.com/mobile/1.3.1/jquery.mobile-1.3.1.min.css", "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-4.0/video-js.min.css",
"thirdparty/video-js-3.2.0/video-js.tube.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", "thirdparty/jqm-icon-pack-3.0/font-awesome/jqm-icon-pack-3.0.0-fa.css",
"css/all.css" + versionString "css/all.css" + versionString
}; };
@ -519,7 +519,7 @@ namespace MediaBrowser.WebDashboard.Api
var newLineBytes = Encoding.UTF8.GetBytes(Environment.NewLine); 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(memoryStream, "thirdparty/autoNumeric.js", newLineBytes).ConfigureAwait(false);
await AppendResource(assembly, memoryStream, "MediaBrowser.WebDashboard.ApiClient.js", newLineBytes).ConfigureAwait(false); await AppendResource(assembly, memoryStream, "MediaBrowser.WebDashboard.ApiClient.js", newLineBytes).ConfigureAwait(false);

24
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -446,6 +446,27 @@
<Content Include="dashboard-ui\thirdparty\video-js-3.2.0\video.min.js"> <Content Include="dashboard-ui\thirdparty\video-js-3.2.0\video.min.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </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"> <Content Include="dashboard-ui\tvgenres.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -988,6 +1009,9 @@
<None Include="dashboard-ui\thirdparty\video-js-3.2.0\captions.vtt"> <None Include="dashboard-ui\thirdparty\video-js-3.2.0\captions.vtt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<None Include="dashboard-ui\thirdparty\video-js-4.0\demo.captions.vtt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<ItemGroup /> <ItemGroup />