From 432d6e570c12cdea9d66637dff7177b5371655a7 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 27 Nov 2015 01:43:14 -0500 Subject: [PATCH] skip web components polyfill when not needed --- .../Api/PackageCreator.cs | 31 ++----------------- .../MediaBrowser.WebDashboard.csproj | 3 -- 2 files changed, 3 insertions(+), 31 deletions(-) diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs index 1efcadfbde..d45cc24582 100644 --- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs +++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs @@ -315,7 +315,7 @@ namespace MediaBrowser.WebDashboard.Api { "vulcanize-out.html" + versionString }; - var importsHtml = string.Join("", imports.Select(i => "").ToArray()); + var importsHtml = string.Join("", imports.Select(i => "").ToArray()); // It would be better to make polymer completely dynamic and loaded on demand, but seeing issues with that // In chrome it is causing the body to be hidden while loading, which leads to width-check methods to return 0 for everything @@ -323,7 +323,7 @@ namespace MediaBrowser.WebDashboard.Api html = html.Replace("", "" + GetMetaTags(mode) + GetCommonCss(mode, appVersion)); - html = html.Replace("", GetInitialJavascript(mode, appVersion) + importsHtml + GetCommonJavascript(mode, appVersion) + ""); + html = html.Replace("", importsHtml + GetCommonJavascript(mode, appVersion) + ""); var bytes = Encoding.UTF8.GetBytes(html); @@ -431,30 +431,6 @@ namespace MediaBrowser.WebDashboard.Api return string.Join(string.Empty, tags); } - /// - /// Gets the common javascript. - /// - /// The mode. - /// The version. - /// System.String. - private string GetInitialJavascript(string mode, string version) - { - var builder = new StringBuilder(); - - var versionString = !string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase) ? "?v=" + version : string.Empty; - - var files = new List - { - "bower_components/webcomponentsjs/webcomponents-lite.js" + versionString - }; - - var tags = files.Select(s => string.Format("", s)).ToArray(); - - builder.Append(string.Join(string.Empty, tags)); - - return builder.ToString(); - } - /// /// Gets the common javascript. /// @@ -477,7 +453,7 @@ namespace MediaBrowser.WebDashboard.Api files.Insert(0, "cordova.js"); } - var tags = files.Select(s => string.Format("", s)).ToArray(); + var tags = files.Select(s => string.Format("", s)).ToArray(); builder.Append(string.Join(string.Empty, tags)); @@ -663,7 +639,6 @@ namespace MediaBrowser.WebDashboard.Api "css/remotecontrol.css", "css/userimage.css", "css/nowplaying.css", - "css/materialize.css", "thirdparty/paper-button-style.css" }; diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index 13fa7fef56..3b58aa417b 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -432,9 +432,6 @@ PreserveNewest - - PreserveNewest - PreserveNewest