mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 19:37:55 +02:00
upgrade to videoJS 4.0
This commit is contained in:
parent
56836ed004
commit
73e256e910
2 changed files with 27 additions and 3 deletions
|
@ -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);
|
||||||
|
|
|
@ -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 />
|
||||||
|
|
Loading…
Reference in a new issue