updated video js

3 files changed, 16 insertions, 28 deletions

diff --git a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
index 14d7f87c3..c0959de85 100644
--- a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
+++ b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
@@ -323,9 +323,9 @@ namespace MediaBrowser.Common.Implementations
             {
                 return Container.GetInstance(type);
             }
-            catch
+            catch (Exception ex)
             {
-                Logger.Error("Error creating {0}", type.Name);
+                Logger.Error("Error creating {0}", ex, type.Name);
 
                 throw;
             }
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index fbc44136b..8660e8816 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 c9406417b..4deca9ec0 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 />