diff options
| author | tikuf <admin@nyalindee.com> | 2014-04-07 12:43:29 +1000 |
|---|---|---|
| committer | tikuf <admin@nyalindee.com> | 2014-04-07 12:43:29 +1000 |
| commit | 8ae71b75fb024815e165eba9b3d00ca8307caab3 (patch) | |
| tree | 54274881bca0834c2ab518c51bc65160fc320db1 /MediaBrowser.WebDashboard/Api/DashboardService.cs | |
| parent | 161e1af0eaa69e828f64d33311e3bc462852d6c4 (diff) | |
| parent | 56c0d491f4c05a2c0c4f21c20e3530c039b33148 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Diffstat (limited to 'MediaBrowser.WebDashboard/Api/DashboardService.cs')
| -rw-r--r-- | MediaBrowser.WebDashboard/Api/DashboardService.cs | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs index dc194ae10..6252a0346 100644 --- a/MediaBrowser.WebDashboard/Api/DashboardService.cs +++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs @@ -14,7 +14,6 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using System.Reflection; using System.Text; using System.Threading.Tasks; using WebMarkupMin.Core.Minifiers; @@ -335,16 +334,16 @@ namespace MediaBrowser.WebDashboard.Api html = html.Replace("<html>", "<html lang=\"" + lang + "\">"); } - try - { - var minifier = new HtmlMinifier(new HtmlMinificationSettings(true)); + //try + //{ + // var minifier = new HtmlMinifier(new HtmlMinificationSettings(true)); - html = minifier.Minify(html).MinifiedContent; - } - catch (Exception ex) - { - Logger.ErrorException("Error minifying html", ex); - } + // html = minifier.Minify(html).MinifiedContent; + //} + //catch (Exception ex) + //{ + // Logger.ErrorException("Error minifying html", ex); + //} } var version = GetType().Assembly.GetName().Version; @@ -510,10 +509,10 @@ namespace MediaBrowser.WebDashboard.Api "librarylist.js", "editorsidebar.js", "librarymenu.js", + "mediacontroller.js", "chromecast.js", "contextmenu.js", - "mediacontroller.js", "mediaplayer.js", "mediaplayer-video.js", |