From 7ea3edd234a6678cb4ceb49ce23649f4743f7bf9 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 31 Mar 2011 17:02:54 +0000 Subject: [PATCH 1/2] See ChangeLog Monotone-Parent: 5882ca24d5eba6f75b71b2264556889290445bad Monotone-Revision: 877003857c443cbee0d3365e26bc55a9110cb707 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-03-31T17:02:54 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 5 +++++ UI/Contacts/UIxContactView.m | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b786d80ab..266662b09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-03-31 Francis Lachapelle + + * UI/Contacts/UIxContactView.m (_cardStringWithLabel:value:): + remove useless carriage returns to avoid JavaScript errors in IE7. + 2011-03-30 Wolfgang Sourdeau * UI/MailerUI/UIxMailFolderActions.m (-copyMessagesAction) diff --git a/UI/Contacts/UIxContactView.m b/UI/Contacts/UIxContactView.m index a2191cf1b..ba7360a9d 100644 --- a/UI/Contacts/UIxContactView.m +++ b/UI/Contacts/UIxContactView.m @@ -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) From 5b11bbc7a5fbc36862ee8ac235a7dd59a04d1500 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 31 Mar 2011 17:22:01 +0000 Subject: [PATCH 2/2] See ChangeLog. Monotone-Parent: 877003857c443cbee0d3365e26bc55a9110cb707 Monotone-Revision: c8f2954fafcf6e28225083320c49c97918ce2a9d Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-03-31T17:22:01 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ UI/WebServerResources/MailerUI.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 266662b09..9e6d7d336 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2011-03-31 Francis Lachapelle + * 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. diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js index a1867c3cd..89a43d939 100644 --- a/UI/WebServerResources/MailerUI.js +++ b/UI/WebServerResources/MailerUI.js @@ -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 = ' '; + else cell.innerHTML = ' '; } }