yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updates how scripts render in main view - make it more clear where the callback is

Browse Source
This commit is contained in:
Shannon
2015-06-16 10:59:47 +02:00
parent 20e265491f
commit fd6caf5cee
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
View File

@@ -66,10 +66,17 @@
<umb-notifications></umb-notifications>
@Html.BareMinimumServerVariables(Url, Url.Action("ExternalLogin", "BackOffice", new { area = ViewBag.UmbracoPath }))
@Html.BareMinimumServerVariablesScript(Url, Url.Action("ExternalLogin", "BackOffice", new { area = ViewBag.UmbracoPath }))
@Html.AngularExternalLoginInfoValues((IEnumerable<string>)ViewBag.ExternalSignInError)
<script type="text/javascript">
document.angularReady = function(app) {
@Html.AngularExternalLoginInfoValuesScript((IEnumerable<string>)ViewBag.ExternalSignInError)
}
</script>
@*And finally we can load in our angular app*@
<script type="text/javascript" src="lib/rgrove-lazyload/lazyload.js"></script>
<script type="text/javascript" src="@Url.GetUrlWithCacheBust("Application", "BackOffice")"></script>

10
src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
View File

@@ -28,7 +28,7 @@ namespace Umbraco.Web
/// These are the bare minimal server variables that are required for the application to start without being authenticated,
/// we will load the rest of the server vars after the user is authenticated.
/// </remarks>
public static IHtmlString BareMinimumServerVariables(this HtmlHelper html, UrlHelper uri, string externalLoginsUrl)
public static IHtmlString BareMinimumServerVariablesScript(this HtmlHelper html, UrlHelper uri, string externalLoginsUrl)
{
var str = @"<script type=""text/javascript"">
var Umbraco = {};
@@ -55,7 +55,7 @@ namespace Umbraco.Web
/// <param name="html"></param>
/// <param name="externalLoginErrors"></param>
/// <returns></returns>
public static IHtmlString AngularExternalLoginInfoValues(this HtmlHelper html, IEnumerable<string> externalLoginErrors)
public static IHtmlString AngularExternalLoginInfoValuesScript(this HtmlHelper html, IEnumerable<string> externalLoginErrors)
{
var loginProviders = html.ViewContext.HttpContext.GetOwinContext().Authentication.GetExternalAuthenticationTypes()
.Where(p => p.Properties.ContainsKey("UmbracoBackOffice"))
@@ -71,8 +71,8 @@ namespace Umbraco.Web
//define a callback that is executed when we bootstrap angular, this is used to inject angular values
//with server side info
var sb = new StringBuilder(@"<script type=""text/javascript"">");
sb.AppendLine(@"document.angularReady = function(app) {");
var sb = new StringBuilder();
sb.AppendLine();
sb.AppendLine(@"var errors = [];");
if (externalLoginErrors != null)
@@ -88,8 +88,6 @@ namespace Umbraco.Web
sb.Append(@"providers: ");
sb.AppendLine(JsonConvert.SerializeObject(loginProviders));
sb.AppendLine(@"});");
sb.AppendLine(@"}");
sb.AppendLine("</script>");
return html.Raw(sb.ToString());
}