diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-07-12 12:06:23 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-07-12 12:06:23 -0400 |
| commit | 3bedcbb4f5a6f416008e26712c6c512893736f32 (patch) | |
| tree | c5e6b4aed205ccbbaf7b8dd427929a8afa3a030a | |
| parent | 4c44315b30c410e2d38dd70d58b19baedee65029 (diff) | |
resolve script error
| -rw-r--r-- | MediaBrowser.WebDashboard/Api/DashboardService.cs | 9 | ||||
| -rw-r--r-- | MediaBrowser.WebDashboard/Api/PackageCreator.cs | 32 | ||||
| -rw-r--r-- | SharedVersion.cs | 2 |
3 files changed, 37 insertions, 6 deletions
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs index ce8ad58dd..6eed91b6c 100644 --- a/MediaBrowser.WebDashboard/Api/DashboardService.cs +++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs @@ -200,9 +200,11 @@ namespace MediaBrowser.WebDashboard.Api var isHtml = IsHtml(path); - if (isHtml && !_serverConfigurationManager.Configuration.IsStartupWizardCompleted) + // Bounce them to the startup wizard if it hasn't been completed yet + if (isHtml && !_serverConfigurationManager.Configuration.IsStartupWizardCompleted && path.IndexOf("wizard", StringComparison.OrdinalIgnoreCase) == -1) { - if (path.IndexOf("wizard", StringComparison.OrdinalIgnoreCase) == -1) + // But don't redirect if an html import is being requested. + if (path.IndexOf("vulcanize", StringComparison.OrdinalIgnoreCase) == -1 && path.IndexOf("bower_components", StringComparison.OrdinalIgnoreCase) == -1) { Request.Response.Redirect("wizardstart.html"); return null; @@ -317,8 +319,9 @@ namespace MediaBrowser.WebDashboard.Api Directory.Delete(Path.Combine(path, "bower_components"), true); Directory.Delete(Path.Combine(path, "thirdparty", "viblast"), true); - + // But we do need this + CopyFile(Path.Combine(creator.DashboardUIPath, "bower_components", "webcomponentsjs", "webcomponents-lite.js"), Path.Combine(path, "bower_components", "webcomponentsjs", "webcomponents-lite.js")); CopyFile(Path.Combine(creator.DashboardUIPath, "bower_components", "webcomponentsjs", "webcomponents-lite.min.js"), Path.Combine(path, "bower_components", "webcomponentsjs", "webcomponents-lite.min.js")); CopyFile(Path.Combine(creator.DashboardUIPath, "bower_components", "velocity", "velocity.min.js"), Path.Combine(path, "bower_components", "velocity", "velocity.min.js")); CopyDirectory(Path.Combine(creator.DashboardUIPath, "bower_components", "swipebox", "src", "css"), Path.Combine(path, "bower_components", "swipebox", "src", "css")); diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs index c7c3d9041..6cc838ac4 100644 --- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs +++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs @@ -315,7 +315,7 @@ namespace MediaBrowser.WebDashboard.Api // In chrome it is causing the body to be hidden while loading, which leads to width-check methods to return 0 for everything //imports = ""; - html = html.Replace("<head>", "<head>" + GetMetaTags(mode) + GetCommonCss(mode, version) + GetCommonJavascript(mode, version) + importsHtml); + html = html.Replace("<head>", "<head>" + GetMetaTags(mode) + GetCommonCss(mode, version) + GetInitialJavascript(mode, version) + importsHtml + GetCommonJavascript(mode, version)); var bytes = Encoding.UTF8.GetBytes(html); @@ -432,6 +432,35 @@ namespace MediaBrowser.WebDashboard.Api /// <param name="mode">The mode.</param> /// <param name="version">The version.</param> /// <returns>System.String.</returns> + private string GetInitialJavascript(string mode, Version version) + { + var builder = new StringBuilder(); + + var versionString = !string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase) ? "?v=" + version : string.Empty; + + var files = new List<string> + { + "bower_components/webcomponentsjs/webcomponents-lite.js" + versionString + }; + + if (string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase)) + { + files.Insert(0, "cordova.js"); + } + + var tags = files.Select(s => string.Format("<script src=\"{0}\"></script>", s)).ToArray(); + + builder.Append(string.Join(string.Empty, tags)); + + return builder.ToString(); + } + + /// <summary> + /// Gets the common javascript. + /// </summary> + /// <param name="mode">The mode.</param> + /// <param name="version">The version.</param> + /// <returns>System.String.</returns> private string GetCommonJavascript(string mode, Version version) { var builder = new StringBuilder(); @@ -440,7 +469,6 @@ namespace MediaBrowser.WebDashboard.Api var files = new List<string> { - "bower_components/webcomponentsjs/webcomponents-lite.js" + versionString, "scripts/all.js" + versionString }; diff --git a/SharedVersion.cs b/SharedVersion.cs index 7e3f785fe..06da826aa 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5666.9")] +[assembly: AssemblyVersion("3.0.5667.5")] |