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

Cleanup IShortStringHelper if controller is gone

Browse Source
This commit is contained in:
Stephan
2018-07-26 11:23:06 +02:00
parent 8c88f8709b
commit 1f353da33c
3 changed files with 0 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
View File

@@ -61,57 +61,6 @@ namespace Umbraco.Core.Strings
#endregion
#region JavaScript
private const string SssjsFormat = @"
var UMBRACO_FORCE_SAFE_ALIAS = {0};
var UMBRACO_FORCE_SAFE_ALIAS_URL = '{1}';
var UMBRACO_FORCE_SAFE_ALIAS_TIMEOUT = 666;
var UMBRACO_FORCE_SAFE_ALIAS_TMKEY = 'safe-alias-tmout';
function getSafeAliasFromServer(value, callback) {{
$.getJSON(UMBRACO_FORCE_SAFE_ALIAS_URL + 'ToSafeAlias?value=' + encodeURIComponent(value), function(json) {{
if (json.alias) {{ callback(json.alias); }}
}});
}}
function getSafeAlias(input, value, immediate, callback) {{
if (!UMBRACO_FORCE_SAFE_ALIAS) {{
callback(value);
return;
}}
var timeout = input.data(UMBRACO_FORCE_SAFE_ALIAS_TMKEY);
if (timeout) clearTimeout(timeout);
input.data(UMBRACO_FORCE_SAFE_ALIAS_TMKEY, setTimeout(function() {{
input.removeData(UMBRACO_FORCE_SAFE_ALIAS_TMKEY);
getSafeAliasFromServer(value, function(alias) {{ callback(alias); }});
}}, UMBRACO_FORCE_SAFE_ALIAS_TIMEOUT));
}}
function validateSafeAlias(input, value, immediate, callback) {{
if (!UMBRACO_FORCE_SAFE_ALIAS) {{
callback(true);
return;
}}
var timeout = input.data(UMBRACO_FORCE_SAFE_ALIAS_TMKEY);
if (timeout) clearTimeout(timeout);
input.data(UMBRACO_FORCE_SAFE_ALIAS_TMKEY, setTimeout(function() {{
input.removeData(UMBRACO_FORCE_SAFE_ALIAS_TMKEY);
getSafeAliasFromServer(value, function(alias) {{ callback(value.toLowerCase() == alias.toLowerCase()); }});
}}, UMBRACO_FORCE_SAFE_ALIAS_TIMEOUT));
}}
";
/// <summary>
/// Gets the JavaScript code defining client-side short string services.
/// </summary>
public string GetShortStringServicesJavaScript(string controllerPath)
{
return string.Format(SssjsFormat, _config.ForceSafeAliases ? "true" : "false", controllerPath);
}
#endregion
#region IShortStringHelper CleanFor...
/// <summary>

5
src/Umbraco.Core/Strings/IShortStringHelper.cs
View File

@@ -6,11 +6,6 @@
/// <remarks>Not necessarily optimized to work on large bodies of text.</remarks>
public interface IShortStringHelper
{
/// <summary>
/// Gets the JavaScript code defining client-side short string services.
/// </summary>
string GetShortStringServicesJavaScript(string controllerPath);
/// <summary>
/// Cleans a string to produce a string that can safely be used in an alias.
/// </summary>

2
src/Umbraco.Tests/Strings/MockShortStringHelper.cs
View File

@@ -12,8 +12,6 @@ namespace Umbraco.Tests.Strings
public bool IsFrozen { get; private set; }
public string GetShortStringServicesJavaScript(string controllerPath) { return "SSSJS"; }
public string CleanStringForSafeAlias(string text)
{
return "SAFE-ALIAS::" + text;