aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2013-05-28 13:32:40 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2013-05-28 13:32:40 -0400
commit969bc00098f8069862d5049c296b905826868ada (patch)
tree4894f43d7aed2856ed6592b70849abe0a66db8ba
parent405e38280b129a88efcaaa870eb9c4716c090694 (diff)
fixed missing compression for dashboard js/css
-rw-r--r--MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs8
-rw-r--r--MediaBrowser.WebDashboard/Api/DashboardService.cs2
2 files changed, 9 insertions, 1 deletions
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
index 8e715e47cd..115114e3a9 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
@@ -381,6 +381,14 @@ namespace MediaBrowser.Server.Implementations.HttpServer
}
if (contentType.StartsWith("application/", StringComparison.OrdinalIgnoreCase))
{
+ if (string.Equals(contentType, "application/x-javascript", StringComparison.OrdinalIgnoreCase))
+ {
+ return true;
+ }
+ if (string.Equals(contentType, "application/xml", StringComparison.OrdinalIgnoreCase))
+ {
+ return true;
+ }
return false;
}
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 20c612be24..7061f8c7fb 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -409,7 +409,7 @@ namespace MediaBrowser.WebDashboard.Api
var files = new[]
{
"http://code.jquery.com/mobile/1.3.1/jquery.mobile-1.3.1.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" + versionString,
"css/all.css" + versionString
};