LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

See Changelog 

Monotone-Parent: ff1aaf81121fa417fa50c91ee3a3d760fc18a5ba
Monotone-Revision: f7ef63bb68e8e8783c8d8407769bfa45805ad9dd

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-11-23T22:33:09
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Francis Lachapelle 2010-11-23 22:33:09 +00:00
parent 25c13b3648
commit 157c41d433
2 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2010-11-23 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/SchedulerUI.js (deletePersonalCalendar):
argument is now the list node instead of simply the node id. The
confirmation callback (deletePersonalCalendarConfirm) is binded to
this object.
(deletePersonalCalendarConfirm): unselect and hide the calendar
node in the list until the Ajax call returns.
(deletePersonalCalendarCallback): remove the hidden calendar node
on success and show it when the Ajax call failed.
(drawNowLine): fixed the selection of the target cells.
2010-11-23 Wolfgang Sourdeau <wsourdeau@inverse.ca> 2010-11-23 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreTypes.m (NSObjectFromSPropValue): added * OpenChange/MAPIStoreTypes.m (NSObjectFromSPropValue): added

41
UI/WebServerResources/SchedulerUI.js
View File

@ -102,9 +102,7 @@ function updateEventFromDragging(controller, eventCells, eventDelta) {
urlstr += "/occurence" + eventCell.recurrenceTime; urlstr += "/occurence" + eventCell.recurrenceTime;
urlstr += ("/adjust?" + params); urlstr += ("/adjust?" + params);
// log(" urlstr: " + urlstr); // log(" urlstr: " + urlstr);
triggerAjaxRequest(urlstr, updateEventFromDraggingCallback, triggerAjaxRequest(urlstr, updateEventFromDraggingCallback);
{ controller: controller,
eventCell: eventCell });
} }
} }
} }
@ -2728,7 +2726,6 @@ function onCalendarRemove(event) {
if (removeFolderRequestCount == 0) { if (removeFolderRequestCount == 0) {
var nodes = $("calendarList").getSelectedNodes(); var nodes = $("calendarList").getSelectedNodes();
for (var i = 0; i < nodes.length; i++) { for (var i = 0; i < nodes.length; i++) {
nodes[i].deselect();
var owner = nodes[i].getAttribute("owner"); var owner = nodes[i].getAttribute("owner");
var folderId = nodes[i].getAttribute("id"); var folderId = nodes[i].getAttribute("id");
if (owner == UserLogin) { if (owner == UserLogin) {
@ -2738,8 +2735,7 @@ function onCalendarRemove(event) {
showAlertDialog(label); showAlertDialog(label);
} }
else { else {
var folderIdElements = folderId.split(":"); deletePersonalCalendar(nodes[i]);
deletePersonalCalendar(folderIdElements[0]);
} }
} }
else { else {
@ -2755,33 +2751,27 @@ function onCalendarRemove(event) {
function deletePersonalCalendar(folderElement) { function deletePersonalCalendar(folderElement) {
showConfirmDialog(_("Confirmation"), showConfirmDialog(_("Confirmation"),
_("Are you sure you want to delete the calendar \"%{0}\"?").formatted($(folderElement).lastChild.nodeValue.strip()), _("Are you sure you want to delete the calendar \"%{0}\"?").formatted(folderElement.lastChild.nodeValue.strip()),
deletePersonalCalendarConfirm.bind(folderElement)); deletePersonalCalendarConfirm.bind(folderElement));
} }
function deletePersonalCalendarConfirm() { function deletePersonalCalendarConfirm() {
var folderId = this.substr(1); var folderId = this.getAttribute("id").substr(1);
this.deselect();
this.hide();
removeFolderRequestCount++; removeFolderRequestCount++;
var url = ApplicationBaseURL + "/" + folderId + "/delete"; var url = ApplicationBaseURL + "/" + folderId + "/delete";
triggerAjaxRequest(url, deletePersonalCalendarCallback, folderId); triggerAjaxRequest(url, deletePersonalCalendarCallback, this);
disposeDialog(); disposeDialog();
} }
function deletePersonalCalendarCallback(http) { function deletePersonalCalendarCallback(http) {
if (http.readyState == 4) { if (http.readyState == 4) {
if (isHttpStatus204(http.status)) { if (isHttpStatus204(http.status)) {
var ul = $("calendarList"); var folderElement = http.callbackData;
var children = ul.childNodesWithTag("li"); if (folderElement) {
var i = 0; var list = folderElement.parentNode;
var done = false; list.removeChild(folderElement);
while (!done && i < children.length) {
var currentFolderId = children[i].getAttribute("id").substr(1);
if (currentFolderId == http.callbackData) {
ul.removeChild(children[i]);
done = true;
}
else
i++;
} }
removeFolderRequestCount--; removeFolderRequestCount--;
if (removeFolderRequestCount == 0) { if (removeFolderRequestCount == 0) {
@ -2791,8 +2781,11 @@ function deletePersonalCalendarCallback(http) {
} }
} }
} }
else else {
log ("ajax problem 5: " + http.status); log ("ajax problem 5: " + http.status);
var folderElement = http.callbackData;
folderElement.show();
}
} }
function configureLists() { function configureLists() {
@ -2856,10 +2849,10 @@ function drawNowLine () {
d = "0" + d; d = "0" + d;
var day = today.getFullYear () + "" + m + "" + d; var day = today.getFullYear () + "" + m + "" + d;
var targets = $$("DIV#daysView DIV.days DIV.day[day=" + day var targets = $$("DIV#daysView DIV.days DIV.day[day=" + day
+ "] DIV.events DIV.clickableHourCell"); + "] DIV.clickableHourCell");
} }
else if (currentView == "weekview") else if (currentView == "weekview")
var targets = $$("DIV#daysView DIV.days DIV.dayOfToday DIV.events DIV.clickableHourCell"); var targets = $$("DIV#daysView DIV.days DIV.dayOfToday DIV.clickableHourCell");
if (targets) { if (targets) {
var target = targets[hours]; var target = targets[hours];