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

Fixes issue of rendering the umb version in the html markup

Browse Source
This commit is contained in:
Shannon
2017-06-15 00:04:42 +02:00
parent 51b19bedc8
commit c13b2fae4b
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/app.js
View File

@@ -39,7 +39,7 @@ angular.module("umbraco.viewcache", [])
$delegate.get = function (url, config) {
if (Umbraco.Sys.ServerVariables.application && url.startsWith("views/") && url.endsWith(".html")) {
var rnd = Umbraco.Sys.ServerVariables.application.version + "." + Umbraco.Sys.ServerVariables.application.cdf;
var rnd = Umbraco.Sys.ServerVariables.application.versionHash;
var _op = (url.indexOf("?") > 0) ? "&" : "?";
url += _op + "umb__rnd=" + rnd;
}

2
src/Umbraco.Web.UI.Client/src/common/services/assets.service.js
View File

@@ -50,7 +50,7 @@ angular.module('umbraco.services')
return url;
}
var rnd = Umbraco.Sys.ServerVariables.application.version + "." + Umbraco.Sys.ServerVariables.application.cdf;
var rnd = Umbraco.Sys.ServerVariables.application.versionHash;
var _op = (url.indexOf("?") > 0) ? "&" : "?";
url = url + _op + "umb__rnd=" + rnd;
return url;

3
src/Umbraco.Web/Editors/BackOfficeController.cs
View File

@@ -756,8 +756,9 @@ namespace Umbraco.Web.Editors
var version = UmbracoVersion.GetSemanticVersion().ToSemanticString();
app.Add("versionHash", string.Format("{0}.{1}", version, ClientDependencySettings.Instance.Version).GenerateHash());
app.Add("version", version);
app.Add("cdf", ClientDependencySettings.Instance.Version);
//useful for dealing with virtual paths on the client side when hosted in virtual directories especially
app.Add("applicationPath", HttpContext.Request.ApplicationPath.EnsureEndsWith('/'));

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

@@ -52,8 +52,7 @@ namespace Umbraco.Web
},
""application"": {
""applicationPath"": """ + html.ViewContext.HttpContext.Request.ApplicationPath + @""",
""version"": """ + version + @""",
""cdf"": """ + ClientDependencySettings.Instance.Version + @"""
""versionHash"": """ + string.Format("{0}.{1}", version, ClientDependencySettings.Instance.Version).GenerateHash() + @"""
},
""isDebuggingEnabled"" : " + html.ViewContext.HttpContext.IsDebuggingEnabled.ToString().ToLowerInvariant() + @"
};