From 499c4d1efb33caaf0c0ac8f164b910546aa84b33 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 9 Feb 2012 20:34:52 +0000 Subject: [PATCH] Monotone-Parent: 96f11391475b0d4e71002f19f89309839d039b36 Monotone-Revision: b2bfdd5b59fed2950707131eca171b4758bcd635 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-02-09T20:34:52 Monotone-Branch: ca.inverse.sogo --- SoObjects/SOGo/NSString+Utilities.m | 4 ++-- UI/WebServerResources/JavascriptAPIExtensions.js | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/SoObjects/SOGo/NSString+Utilities.m b/SoObjects/SOGo/NSString+Utilities.m index c9079c4bd..0d01f9970 100644 --- a/SoObjects/SOGo/NSString+Utilities.m +++ b/SoObjects/SOGo/NSString+Utilities.m @@ -288,12 +288,12 @@ static int cssEscapingCount; int count; strings = [NSArray arrayWithObjects: @"_U_", @"_D_", @"_H_", @"_A_", @"_S_", - @"_C_", @"_CO_", @"_SP_", @"_SQ_", @"_AM_", nil]; + @"_C_", @"_CO_", @"_SP_", @"_SQ_", @"_AM_", @"_P_", nil]; [strings retain]; cssEscapingStrings = [strings asPointersOfObjects]; characters = [NSArray arrayWithObjects: @"_", @".", @"#", @"@", @"*", @":", - @",", @" ", @"'", @"&", nil]; + @",", @" ", @"'", @"&", @"+", nil]; cssEscapingCount = [strings count]; cssEscapingCharacters = NSZoneMalloc (NULL, (cssEscapingCount + 1) diff --git a/UI/WebServerResources/JavascriptAPIExtensions.js b/UI/WebServerResources/JavascriptAPIExtensions.js index 973082d14..32c7a7034 100644 --- a/UI/WebServerResources/JavascriptAPIExtensions.js +++ b/UI/WebServerResources/JavascriptAPIExtensions.js @@ -70,8 +70,10 @@ String.prototype.asDate = function () { }; String.prototype.asCSSIdentifier = function() { - var characters = [ '_' , '\\.', '#' , '@' , '\\*', ':' , ',' , ' ' , "'", '&' ]; - var escapeds = [ '_U_', '_D_', '_H_', '_A_', '_S_', '_C_', '_CO_', '_SP_', '_SQ_', '_AM_' ]; + 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++) {