See ChangeLog.

Monotone-Parent: 85e45d760950cc2bf044381b71708cf2f40ad1a5
Monotone-Revision: 9d007ec918e081bd43a3d7944e72cdabbd06949f

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-07-06T19:22:11
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2010-07-06 19:22:11 +00:00
parent b674cd4e85
commit cedf1c2479
3 changed files with 12 additions and 4 deletions

View File

@@ -1,3 +1,11 @@
2010-07-06 Francis Lachapelle <flachapelle@inverse.ca>
* SoObjects/SOGo/NSString+Utilities.m (-_setupCSSEscaping): added
the single quote (') in the list of characters to escape.
* UI/WebServerResources/JavascriptAPIExtensions.js
(asCSSIdentifier): idem.
2010-07-05 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/UIxContactEditor.js

View File

@@ -263,12 +263,12 @@ static int cssEscapingCount;
int count;
strings = [NSArray arrayWithObjects: @"_U_", @"_D_", @"_H_", @"_A_", @"_S_",
@"_C_", @"_CO_", @"_SP_", nil];
@"_C_", @"_CO_", @"_SP_", @"_SQ_", nil];
[strings retain];
cssEscapingStrings = [strings asPointersOfObjects];
characters = [NSArray arrayWithObjects: @"_", @".", @"#", @"@", @"*", @":",
@",", @" ", nil];
@",", @" ", @"'", nil];
cssEscapingCount = [strings count];
cssEscapingCharacters = NSZoneMalloc (NULL,
(cssEscapingCount + 1)

View File

@@ -60,8 +60,8 @@ String.prototype.asDate = function () {
};
String.prototype.asCSSIdentifier = function() {
var characters = [ '_' , '\\.', '#' , '@' , '\\*', ':' , ',' , ' ' ];
var escapeds = [ '_U_', '_D_', '_H_', '_A_', '_S_', '_C_', '_CO_', '_SP_' ];
var characters = [ '_' , '\\.', '#' , '@' , '\\*', ':' , ',' , ' ', "'" ];
var escapeds = [ '_U_', '_D_', '_H_', '_A_', '_S_', '_C_', '_CO_', '_SP_', '_SQ_' ];
var newString = this;
for (var i = 0; i < characters.length; i++) {