mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 03:26:07 +02:00
updated video js
This commit is contained in:
parent
82dfb4ffb5
commit
6d5d722bc6
3 changed files with 16 additions and 28 deletions
|
@ -323,9 +323,9 @@ namespace MediaBrowser.Common.Implementations
|
||||||
{
|
{
|
||||||
return Container.GetInstance(type);
|
return Container.GetInstance(type);
|
||||||
}
|
}
|
||||||
catch
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
Logger.Error("Error creating {0}", type.Name);
|
Logger.Error("Error creating {0}", ex, type.Name);
|
||||||
|
|
||||||
throw;
|
throw;
|
||||||
}
|
}
|
||||||
|
|
|
@ -398,7 +398,7 @@ 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/video-js.min.css",
|
"thirdparty/video-js-3.2.0/video-js.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
|
||||||
};
|
};
|
||||||
|
@ -421,7 +421,7 @@ namespace MediaBrowser.WebDashboard.Api
|
||||||
{
|
{
|
||||||
"http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js",
|
"http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js",
|
||||||
"http://code.jquery.com/mobile/1.3.1/jquery.mobile-1.3.1.min.js",
|
"http://code.jquery.com/mobile/1.3.1/jquery.mobile-1.3.1.min.js",
|
||||||
"thirdparty/video-js/video.min.js",
|
"thirdparty/video-js-3.2.0/video.min.js",
|
||||||
"scripts/all.js" + versionString
|
"scripts/all.js" + versionString
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -356,30 +356,17 @@
|
||||||
<Content Include="dashboard-ui\scripts\videojsextensions.js">
|
<Content Include="dashboard-ui\scripts\videojsextensions.js">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="dashboard-ui\thirdparty\video-js\video-js.min.css">
|
<Content Include="dashboard-ui\thirdparty\video-js-3.2.0\demo.html" />
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<Content Include="dashboard-ui\thirdparty\video-js-3.2.0\video-js.css" />
|
||||||
</Content>
|
<Content Include="dashboard-ui\thirdparty\video-js-3.2.0\video-js.min.css" />
|
||||||
<Content Include="dashboard-ui\thirdparty\video-js\video-js.png">
|
<Content Include="dashboard-ui\thirdparty\video-js-3.2.0\video-js.min.css" />
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<Content Include="dashboard-ui\thirdparty\video-js-3.2.0\video-js.png" />
|
||||||
</Content>
|
<Content Include="dashboard-ui\thirdparty\video-js-3.2.0\video-js.png" />
|
||||||
<Content Include="dashboard-ui\thirdparty\video-js\video-js.swf">
|
<Content Include="dashboard-ui\thirdparty\video-js-3.2.0\video-js.swf" />
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<Content Include="dashboard-ui\thirdparty\video-js-3.2.0\video-js.swf" />
|
||||||
</Content>
|
<Content Include="dashboard-ui\thirdparty\video-js-3.2.0\video.js" />
|
||||||
<Content Include="dashboard-ui\thirdparty\video-js\video.min.js">
|
<Content Include="dashboard-ui\thirdparty\video-js-3.2.0\video.min.js" />
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<Content Include="dashboard-ui\thirdparty\video-js-3.2.0\video.min.js" />
|
||||||
</Content>
|
|
||||||
<Content Include="dashboard-ui\thirdparty\video-js\video-js.min.css">
|
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
<Content Include="dashboard-ui\thirdparty\video-js\video-js.png">
|
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
<Content Include="dashboard-ui\thirdparty\video-js\video-js.swf">
|
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
<Content Include="dashboard-ui\thirdparty\video-js\video.min.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>
|
||||||
|
@ -916,6 +903,7 @@
|
||||||
</Content>
|
</Content>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<None Include="dashboard-ui\thirdparty\video-js-3.2.0\captions.vtt" />
|
||||||
<None Include="packages.config" />
|
<None Include="packages.config" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup />
|
<ItemGroup />
|
||||||
|
|
Loading…
Reference in a new issue