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

U3-3314 - refactor 4895b5a

Browse Source
This commit is contained in:
Stephan
2013-11-05 09:00:23 +01:00
parent cf342ece45
commit 74df45a056
5 changed files with 6 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Core/StringExtensions.cs
View File

@@ -956,10 +956,13 @@ namespace Umbraco.Core
/// Cleans a string to produce a string that can safely be used in an alias.
/// </summary>
/// <param name="alias">The text to filter.</param>
/// <param name="camel">A value indicating that we want to camel-case the alias.</param>
/// <returns>The safe alias.</returns>
public static string ToSafeCamelAlias(this string alias)
public static string ToSafeAlias(this string alias, bool camel)
{
return ShortStringHelper.CleanStringForSafeCamelAlias(alias);
var a = ShortStringHelper.CleanStringForSafeAlias(alias);
if (string.IsNullOrWhiteSpace(a) || camel == false) return a;
return char.ToLowerInvariant(a[0]) + a.Substring(1);
}
/// <summary>

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

@@ -248,34 +248,6 @@ function validateSafeAlias(id, value, immediate, callback) {{
return CleanString(text, CleanStringType.Ascii | CleanStringType.UmbracoCase | CleanStringType.Alias);
}
/// <summary>
/// Cleans a string to produce a string that can safely be used in an alias.
/// </summary>
/// <param name="text">The text to filter.</param>
/// <returns>The safe alias.</returns>
/// <remarks>
/// <para>The string will be cleaned in the context of the default culture.</para>
/// <para>Safe aliases are Ascii only.</para>
/// </remarks>
public virtual string CleanStringForSafeCamelAlias(string text)
{
return CleanString(text, CleanStringType.Ascii | CleanStringType.CamelCase | CleanStringType.Alias);
}
/// <summary>
/// Cleans a string, in the context of a specified culture, to produce a string that can safely be used in an alias.
/// </summary>
/// <param name="text">The text to filter.</param>
/// <param name="culture">The culture.</param>
/// <returns>The safe alias.</returns>
/// <remarks>
/// <para>Safe aliases are Ascii only.</para>
/// </remarks>
public virtual string CleanStringForSafeCamelAlias(string text, CultureInfo culture)
{
return CleanString(text, CleanStringType.Ascii | CleanStringType.CamelCase | CleanStringType.Alias, culture);
}
/// <summary>
/// Cleans a string, in the context of a specified culture, to produce a string that can safely be used in an alias.
/// </summary>

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

@@ -31,19 +31,6 @@ namespace Umbraco.Core.Strings
/// </remarks>
string CleanStringForSafeAlias(string text);
/// <summary>
/// Cleans a string to produce a string that can safely be used in an alias.
/// </summary>
/// <param name="text">The text to filter.</param>
/// <returns>The safe alias.</returns>
/// <remarks>
/// <para>The string will be cleaned in the context of the IShortStringHelper default culture.</para>
/// <para>A safe alias is [a-z][a-zA-Z0-9_]* although legacy will also accept '-', and '_' at the beginning.</para>
/// </remarks>
string CleanStringForSafeCamelAlias(string text);
/// <summary>
/// Cleans a string, in the context of a specified culture, to produce a string that can safely be used in an alias.
/// </summary>
@@ -52,14 +39,6 @@ namespace Umbraco.Core.Strings
/// <returns>The safe alias.</returns>
string CleanStringForSafeAlias(string text, CultureInfo culture);
/// <summary>
/// Cleans a string, in the context of a specified culture, to produce a string that can safely be used in an alias.
/// </summary>
/// <param name="text">The text to filter.</param>
/// <param name="culture">The culture.</param>
/// <returns>The safe alias.</returns>
string CleanStringForSafeCamelAlias(string text, CultureInfo culture);
/// <summary>
/// Cleans a string to produce a string that can safely be used in an url segment.
/// </summary>

24
src/Umbraco.Core/Strings/LegacyShortStringHelper.cs
View File

@@ -138,18 +138,6 @@ function isValidAlias(alias) {{
return safeString.ToString();
}
/// <summary>
/// Cleans a string to produce a string that can safely be used in an alias.
/// </summary>
/// <param name="text">The text to filter.</param>
/// <returns>The safe alias.</returns>
/// <remarks>The string will be cleaned in the context of invariant culture.</remarks>
public string CleanStringForSafeCamelAlias(string text)
{
var t = CleanStringForSafeAlias(text);
return Char.ToLowerInvariant(t[0]) + t.Substring(1);
}
/// <summary>
/// Cleans a string, in the context of the invariant culture, to produce a string that can safely be used in an alias.
/// </summary>
@@ -162,18 +150,6 @@ function isValidAlias(alias) {{
return CleanStringForSafeAlias(text);
}
/// <summary>
/// Cleans a string, in the context of the invariant culture, to produce a string that can safely be used in an alias.
/// </summary>
/// <param name="text">The text to filter.</param>
/// <param name="culture">The culture.</param>
/// <returns>The safe alias.</returns>
/// <remarks>Legacy does not support culture contexts.</remarks>
public string CleanStringForSafeCamelAlias(string text, CultureInfo culture)
{
return CleanStringForSafeCamelAlias(text);
}
/// <summary>
/// Cleans a string to produce a string that can safely be used in an url segment, in the context of the invariant culture.
/// </summary>

2
src/Umbraco.Web/WebServices/CoreStringsController.cs
View File

@@ -22,7 +22,7 @@ namespace Umbraco.Web.WebServices
{
return value == null
? Json(new {error = "no value."}, JsonRequestBehavior.AllowGet)
: Json(new { alias = camelCase ? value.ToSafeCamelAlias() : value.ToSafeAlias() }, JsonRequestBehavior.AllowGet);
: Json(new { alias = value.ToSafeAlias(camelCase) }, JsonRequestBehavior.AllowGet);
}
[HttpGet]