merge of '6e077ed907974bc4e78dbdf12a128ba170de5a38'

and 'a216f87669942e793f9124b63661a5ae82105c1d'

Monotone-Parent: 6e077ed907974bc4e78dbdf12a128ba170de5a38
Monotone-Parent: a216f87669942e793f9124b63661a5ae82105c1d
Monotone-Revision: bdc770e039bce1273bf76acc5e48dd7006974831

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-02-01T16:30:00
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2008-02-01 16:30:00 +00:00
10 changed files with 174 additions and 112 deletions

View File

@@ -322,7 +322,8 @@ function displayFreeBusyForNode(input) {
}
var sd = $('startTime_date').valueAsShortDateString();
var ed = $('endTime_date').valueAsShortDateString();
var urlstr = ( UserFolderURL + "../" + input.uid + "/freebusy.ifb/ajaxRead?"
var urlstr = ( UserFolderURL + "../" + input.uid
+ "/freebusy.ifb/ajaxRead?"
+ "sday=" + sd + "&eday=" + ed + "&additional=" +
additionalDays );
document.contactFreeBusyAjaxRequest
@@ -601,7 +602,8 @@ function prepareAttendees() {
$(row).addClassName(attendeesEditor.states[i]);
var input = $(row).down("input");
var value = "";
if (attendeesEditor.names[i].length > 0 && attendeesEditor.names[i] != attendeesEditor.emails[i])
if (attendeesEditor.names[i].length > 0
&& attendeesEditor.names[i] != attendeesEditor.emails[i])
value += attendeesEditor.names[i] + " ";
value += "<" + attendeesEditor.emails[i] + ">";
input.value = value;