From 7d018221ef753942711826b534f23f8e3bf7447e Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Wed, 10 Jun 2015 16:31:15 -0400 Subject: [PATCH] Revert "Improve creation of CSS identifier" This reverts commit e40a19cf8990136e55ba728b4626ca1877e064be. --- SoObjects/SOGo/NSString+Utilities.m | 12 +++--------- UI/WebServerResources/JavascriptAPIExtensions.js | 10 ++++------ 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/SoObjects/SOGo/NSString+Utilities.m b/SoObjects/SOGo/NSString+Utilities.m index 6938e9478..46f42af8e 100644 --- a/SoObjects/SOGo/NSString+Utilities.m +++ b/SoObjects/SOGo/NSString+Utilities.m @@ -333,18 +333,12 @@ static int cssEscapingCount; int count; strings = [NSArray arrayWithObjects: @"_U_", @"_D_", @"_H_", @"_A_", @"_S_", - @"_C_", @"_SC_", - @"_CO_", @"_SP_", @"_SQ_", @"_DQ_", - @"_LP_", @"_RP_", @"_LS_", @"_RS_", @"_LC_", @"_RC_", - @"_AM_", @"_P_", @"_DS_", nil]; + @"_C_", @"_CO_", @"_SP_", @"_SQ_", @"_AM_", @"_P_", @"_DS_", nil]; [strings retain]; cssEscapingStrings = [strings asPointersOfObjects]; - characters = [NSArray arrayWithObjects: @"_", @".", @"#", @"@", @"*", - @":", @";", - @",", @" ", @"'", @"\"", - @"(", @")", @"[", @"]", @"{", @"}", - @"&", @"+", @"$", nil]; + characters = [NSArray arrayWithObjects: @"_", @".", @"#", @"@", @"*", @":", + @",", @" ", @"'", @"&", @"+", @"$", nil]; cssEscapingCount = [strings count]; cssEscapingCharacters = NSZoneMalloc (NULL, (cssEscapingCount + 1) diff --git a/UI/WebServerResources/JavascriptAPIExtensions.js b/UI/WebServerResources/JavascriptAPIExtensions.js index c8cd358ec..245078268 100644 --- a/UI/WebServerResources/JavascriptAPIExtensions.js +++ b/UI/WebServerResources/JavascriptAPIExtensions.js @@ -95,12 +95,10 @@ String.prototype.asDate = function () { }; String.prototype.asCSSIdentifier = function() { - var characters = [ '_' , '\\.', '#' , '@' , '\\*', ':' , ';' , ',' , ' ', - '\\(', '\\)', '\\[', '\\]', '\\{', '\\}', - , "'", '"', '&', '\\+' ]; - var escapeds = [ '_U_', '_D_', '_H_', '_A_', '_S_', '_C_', '_SC_', '_CO_', '_SP_', - '_LP_', '_RP_', '_LS_', '_RQ_', '_LC_', '_RC_', - '_SQ_', '_DQ_', '_AM_', '_P_' ]; + var characters = [ '_' , '\\.', '#' , '@' , '\\*', ':' , ',' , ' ' + , "'", '&', '\\+' ]; + var escapeds = [ '_U_', '_D_', '_H_', '_A_', '_S_', '_C_', '_CO_', + '_SP_', '_SQ_', '_AM_', '_P_' ]; var newString = this; for (var i = 0; i < characters.length; i++) {