diff options
| author | Tim Hobbs <jesus.tesh@gmail.com> | 2014-04-06 11:01:26 -0700 |
|---|---|---|
| committer | Tim Hobbs <jesus.tesh@gmail.com> | 2014-04-06 11:01:26 -0700 |
| commit | 631bba1d3cbcd2e8dc9c84c23d89b910dc8e0113 (patch) | |
| tree | 3ff1455a7dbf551e5752b3c88f9adb3bc9554644 /MediaBrowser.WebDashboard/Api/DashboardService.cs | |
| parent | 0f88830fd98173815da097c54e5d8d5281dbffd5 (diff) | |
| parent | c60103df64104459883f1244363cc9cd39187545 (diff) | |
Merge remote-tracking branch 'upstream/master'
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", |