Monotone-Parent: 36b65152583027c2506fe59e3b0c3c5c9afe9dd2

Monotone-Revision: 361e773d3d8846808f8d0ac504cac38d25cbff5c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-02-10T05:54:20
This commit is contained in:
Wolfgang Sourdeau
2012-02-10 05:54:20 +00:00
parent d5a90f7950
commit a8ae0e30f4
3 changed files with 14 additions and 4 deletions
+8
View File
@@ -1,3 +1,11 @@
2012-02-10 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/WebServerResources/JavascriptAPIExtensions.js
(String.asCSSIdentifier): same as below.
* SoObjects/SOGo/NSString+Utilities.m (-setupCSSEscaping): add
"_P_" as escaping sequence for "+".
2012-02-08 Francis Lachapelle <flachapelle@inverse.ca>
* SoObjects/SOGo/SOGoGCSFolder.m (+webdavAclManager): must include
+2 -2
View File
@@ -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)
@@ -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++) {