LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "Revert "Improve creation of CSS identifier""

Browse source 
This reverts commit 7d018221ef.
This commit is contained in:
Ludovic Marcotte 2015-06-10 20:05:40 -04:00
parent 85ad849189
commit d9896192f3
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
SoObjects/SOGo/NSString+Utilities.m
View file

@ -333,12 +333,18 @@ static int cssEscapingCount;
int count; int count;
strings = [NSArray arrayWithObjects: @"_U_", @"_D_", @"_H_", @"_A_", @"_S_", strings = [NSArray arrayWithObjects: @"_U_", @"_D_", @"_H_", @"_A_", @"_S_",
@"_C_", @"_CO_", @"_SP_", @"_SQ_", @"_AM_", @"_P_", @"_DS_", nil]; @"_C_", @"_SC_",
@"_CO_", @"_SP_", @"_SQ_", @"_DQ_",
@"_LP_", @"_RP_", @"_LS_", @"_RS_", @"_LC_", @"_RC_",
@"_AM_", @"_P_", @"_DS_", nil];
[strings retain]; [strings retain];
cssEscapingStrings = [strings asPointersOfObjects]; cssEscapingStrings = [strings asPointersOfObjects];
characters = [NSArray arrayWithObjects: @"_", @".", @"#", @"@", @"*", @":", characters = [NSArray arrayWithObjects: @"_", @".", @"#", @"@", @"*",
@",", @" ", @"'", @"&", @"+", @"$", nil]; @":", @";",
@",", @" ", @"'", @"\"",
@"(", @")", @"[", @"]", @"{", @"}",
@"&", @"+", @"$", nil];
cssEscapingCount = [strings count]; cssEscapingCount = [strings count];
cssEscapingCharacters = NSZoneMalloc (NULL, cssEscapingCharacters = NSZoneMalloc (NULL,
(cssEscapingCount + 1) (cssEscapingCount + 1)

10
UI/WebServerResources/JavascriptAPIExtensions.js
View file

@ -95,10 +95,12 @@ String.prototype.asDate = function () {
}; };
String.prototype.asCSSIdentifier = function() { String.prototype.asCSSIdentifier = function() {
var characters = [ '_' , '\\.', '#' , '@' , '\\*', ':' , ',' , ' ' var characters = [ '_' , '\\.', '#' , '@' , '\\*', ':' , ';' , ',' , ' ',
, "'", '&', '\\+' ]; '\\(', '\\)', '\\[', '\\]', '\\{', '\\}',
var escapeds = [ '_U_', '_D_', '_H_', '_A_', '_S_', '_C_', '_CO_', , "'", '"', '&', '\\+' ];
'_SP_', '_SQ_', '_AM_', '_P_' ]; var escapeds = [ '_U_', '_D_', '_H_', '_A_', '_S_', '_C_', '_SC_', '_CO_', '_SP_',
'_LP_', '_RP_', '_LS_', '_RQ_', '_LC_', '_RC_',
'_SQ_', '_DQ_', '_AM_', '_P_' ];
var newString = this; var newString = this;
for (var i = 0; i < characters.length; i++) { for (var i = 0; i < characters.length; i++) {