From 1f353da33cb026efe2b31452b18213c08f5a5e13 Mon Sep 17 00:00:00 2001 From: Stephan Date: Thu, 26 Jul 2018 11:23:06 +0200 Subject: [PATCH] Cleanup IShortStringHelper if controller is gone --- .../Strings/DefaultShortStringHelper.cs | 51 ------------------- .../Strings/IShortStringHelper.cs | 5 -- .../Strings/MockShortStringHelper.cs | 2 - 3 files changed, 58 deletions(-) diff --git a/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs b/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs index 2e2ec8094a..84ab0de585 100644 --- a/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs +++ b/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs @@ -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)); -}} -"; - - /// - /// Gets the JavaScript code defining client-side short string services. - /// - public string GetShortStringServicesJavaScript(string controllerPath) - { - return string.Format(SssjsFormat, _config.ForceSafeAliases ? "true" : "false", controllerPath); - } - - #endregion - #region IShortStringHelper CleanFor... /// diff --git a/src/Umbraco.Core/Strings/IShortStringHelper.cs b/src/Umbraco.Core/Strings/IShortStringHelper.cs index fe5ebe0bf8..085b5adb7a 100644 --- a/src/Umbraco.Core/Strings/IShortStringHelper.cs +++ b/src/Umbraco.Core/Strings/IShortStringHelper.cs @@ -6,11 +6,6 @@ /// Not necessarily optimized to work on large bodies of text. public interface IShortStringHelper { - /// - /// Gets the JavaScript code defining client-side short string services. - /// - string GetShortStringServicesJavaScript(string controllerPath); - /// /// Cleans a string to produce a string that can safely be used in an alias. /// diff --git a/src/Umbraco.Tests/Strings/MockShortStringHelper.cs b/src/Umbraco.Tests/Strings/MockShortStringHelper.cs index e0df7ea4e9..a39f962908 100644 --- a/src/Umbraco.Tests/Strings/MockShortStringHelper.cs +++ b/src/Umbraco.Tests/Strings/MockShortStringHelper.cs @@ -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;