aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2013-05-15 23:39:27 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2013-05-15 23:39:27 -0400
commit23d9d4ef733d127273721ecb81728d9f39ed2aac (patch)
tree6d5eb2ad5f771c727343935e4bd30676036b66d4
parentf3d91af166cc99d1586a204c5993044ac0fddf34 (diff)
parentec1fd4821dbaa055f8291c0d1f904d616a52b7a1 (diff)
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
-rw-r--r--MediaBrowser.WebDashboard/Api/DashboardService.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index ab209104d..683ecda97 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-4.0/video-js.css",
- "thirdparty/video-js-4.0/video-js.tube.min.css",
+ "thirdparty/video-js-3.2.0/video-js.min.css",
+ "thirdparty/video-js-3.2.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-4.0/video.js", newLineBytes).ConfigureAwait(false);
+ await AppendResource(memoryStream, "thirdparty/video-js-3.2.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);