merge of '277192cc101d97ca24773acdb0d3ac5ec0e0a182'

and 'c8f2954fafcf6e28225083320c49c97918ce2a9d'

Monotone-Parent: 277192cc101d97ca24773acdb0d3ac5ec0e0a182
Monotone-Parent: c8f2954fafcf6e28225083320c49c97918ce2a9d
Monotone-Revision: 92df195fbe1c4391ea6ee2bda8d4c6df56a3b430

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-03-31T21:55:02
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2011-03-31 21:55:02 +00:00
3 changed files with 11 additions and 2 deletions

View File

@@ -3,6 +3,14 @@
* OpenChange/MAPIStoreRecurrenceUtils.m: new module implementing
methods useful for handling recurrences in events and tasks.
2011-03-31 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/MailerUI.js (messageListCallback): put an
non-breaking space in empty cells, not only for IE.
* UI/Contacts/UIxContactView.m (_cardStringWithLabel:value:):
remove useless carriage returns to avoid JavaScript errors in IE7.
2011-03-30 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/MailerUI/UIxMailFolderActions.m (-copyMessagesAction)

View File

@@ -1,6 +1,6 @@
/*
Copyright (C) 2004 SKYRIX Software AG
Copyright (C) 2005-2010 Inverse inc.
Copyright (C) 2005-2011 Inverse inc.
This file is part of SOGo.
@@ -64,6 +64,7 @@
NSMutableString *cardString;
cardString = [NSMutableString stringWithCapacity: 80];
value = [value stringByReplacingString: @"\r" withString: @""];
if ([value length] > 0)
{
if (label)

View File

@@ -828,7 +828,7 @@ function messageListCallback(row, data, isNew) {
var cellType = columnsOrder[j];
if (data[cellType]) cell.innerHTML = data[cellType];
else if (Prototype.Browser.IE) cell.innerHTML = '&nbsp;';
else cell.innerHTML = '&nbsp;';
}
}