diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-04-23 17:05:21 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-04-23 17:05:21 -0400 |
| commit | 6d5d722bc6c259fbdf6cb9b6df839e5dea2177d0 (patch) | |
| tree | 0ac146ac0fce70d2e1ecbb467664ad9148cd20c7 /MediaBrowser.WebDashboard | |
| parent | 82dfb4ffb58f71c8ced4148cd45b9b3525a722b5 (diff) | |
updated video js
Diffstat (limited to 'MediaBrowser.WebDashboard')
| -rw-r--r-- | MediaBrowser.WebDashboard/Api/DashboardService.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj | 36 |
2 files changed, 14 insertions, 26 deletions
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs index fbc44136b2..8660e8816f 100644 --- a/MediaBrowser.WebDashboard/Api/DashboardService.cs +++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs @@ -398,7 +398,7 @@ 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/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", "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://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 }; diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index c9406417b9..4deca9ec02 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -356,30 +356,17 @@ <Content Include="dashboard-ui\scripts\videojsextensions.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</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\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\thirdparty\video-js-3.2.0\demo.html" />
+ <Content Include="dashboard-ui\thirdparty\video-js-3.2.0\video-js.css" />
+ <Content Include="dashboard-ui\thirdparty\video-js-3.2.0\video-js.min.css" />
+ <Content Include="dashboard-ui\thirdparty\video-js-3.2.0\video-js.min.css" />
+ <Content Include="dashboard-ui\thirdparty\video-js-3.2.0\video-js.png" />
+ <Content Include="dashboard-ui\thirdparty\video-js-3.2.0\video-js.png" />
+ <Content Include="dashboard-ui\thirdparty\video-js-3.2.0\video-js.swf" />
+ <Content Include="dashboard-ui\thirdparty\video-js-3.2.0\video-js.swf" />
+ <Content Include="dashboard-ui\thirdparty\video-js-3.2.0\video.js" />
+ <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" />
<Content Include="dashboard-ui\tvgenres.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@@ -916,6 +903,7 @@ </Content>
</ItemGroup>
<ItemGroup>
+ <None Include="dashboard-ui\thirdparty\video-js-3.2.0\captions.vtt" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup />
|