From 73e256e9109dd3fc37d90660b46ee2bd3c387be4 Mon Sep 17 00:00:00 2001 From: Techywarrior Date: Wed, 15 May 2013 18:50:49 -0700 Subject: [PATCH] upgrade to videoJS 4.0 --- .../Api/DashboardService.cs | 6 ++--- .../MediaBrowser.WebDashboard.csproj | 24 +++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs index 683ecda978..b90553e2e1 100644 --- a/MediaBrowser.WebDashboard/Api/DashboardService.cs +++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs @@ -409,8 +409,8 @@ 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-3.2.0/video-js.min.css", - "thirdparty/video-js-3.2.0/video-js.tube.min.css", + "thirdparty/video-js-4.0/video-js.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", "css/all.css" + versionString }; @@ -519,7 +519,7 @@ namespace MediaBrowser.WebDashboard.Api 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(assembly, memoryStream, "MediaBrowser.WebDashboard.ApiClient.js", newLineBytes).ConfigureAwait(false); diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index d29f0e8a79..dbf0e90e28 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -446,6 +446,27 @@ PreserveNewest + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + PreserveNewest @@ -988,6 +1009,9 @@ PreserveNewest + + PreserveNewest +