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

Fixes up the GetUrlWithTimeStamp to be called GetUrlWithCacheBust and another extension method to actually generate the hash which will be umb version + cdf version hashed or datetime.ticks if in debug mode. Updates the main view to use CDF to render the CSS which ensures compression/minification/combination + cache busting.

Browse Source
This commit is contained in:
Shannon
2014-03-07 11:03:13 +11:00
parent bb527996b9
commit 9dd5f250c7
4 changed files with 44 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Web/UI/JavaScript/JsInitialization.cs
View File

@@ -55,11 +55,8 @@ namespace Umbraco.Web.UI.JavaScript
else
{
//create a unique hash code of the current umb version and the current cdf version
var versionHash = new HashCodeCombiner();
versionHash.AddCaseInsensitiveString(UmbracoVersion.Current.ToString());
versionHash.AddCaseInsensitiveString(ClientDependencySettings.Instance.Version.ToString(CultureInfo.InvariantCulture));
var version = "'" + versionHash.GetCombinedHashCode() + "'";
var versionHash = UrlHelperExtensions.GetCacheBustHash();
var version = "'" + versionHash + "'";
noCache = noCache.Replace("##rnd##", version);
}

1
src/Umbraco.Web/UI/JavaScript/JsNoCache.js
View File

@@ -2,7 +2,6 @@ yepnope.addFilter(function (resourceObj) {
var url = resourceObj.url.toLowerCase();
var rnd = ##rnd##;
var op = "?";
debugger;
if(url.indexOf("lib/") === 0 || url.indexOf("js/umbraco.") === 0 || url.indexOf("dependencyhandler.axd") > 0) {
return resourceObj;