From ade5980c50e8a13f308f8e7242fd1c8aa4c7581d Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 21 Jul 2009 22:53:15 +0000 Subject: [PATCH] Fix for title/summary splitted on multiple lines Monotone-Parent: 652b773b73294ac8e25c200c2a0390b537c03f3c Monotone-Revision: 73bddf106670066c1ab2439a3c1357818b18fcc5 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2009-07-21T22:53:15 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/SchedulerUI.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index e28161e59..267529682 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -377,7 +377,7 @@ function onViewEventCallback(http) { } // Put the event's data in the DIV - div.down("h1").update(data["summary"]); + div.down("h1").update(data["summary"].replace(/\r?\n/g, "
")); if (parseInt(data["isAllDay"]) == 0) { div.down("P", 0).down("SPAN", 1).update(data["startTime"]); div.down("P", 0).show(); @@ -390,7 +390,7 @@ function onViewEventCallback(http) { div.down("P", 1).hide(); if (data["description"].length) { - div.down("P", 2).update(data["description"].replace(/\r\n/g, "
")); + div.down("P", 2).update(data["description"].replace(/\r?\n/g, "
")); div.down("P", 2).show(); } else div.down("P", 2).hide(); @@ -1037,7 +1037,7 @@ function newBaseEventDIV(eventRep, event, eventText) { var textDiv = $(document.createElement("div")); innerDiv.appendChild(textDiv); textDiv.addClassName("text"); - textDiv.appendChild(document.createTextNode(eventText)); + textDiv.update(eventText.replace(/(\\r)?\\n/g, "
")); if (event[2] != null) { // Status field is defined -- user can read event