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

See Changelog. 

Monotone-Parent: b54a4a89914eab992aa8dfa993817ad238c63a44
Monotone-Revision: 9d48a94d741021fe7ac3ee6f71d69855f8348d2d

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-10-08T16:08:10
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Francis Lachapelle 2010-10-08 16:08:10 +00:00
parent 38c346083a
commit 50c9612b2f
2 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2010-10-08 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/SchedulerUI.js
(deleteEventFromViewCancel): new function loaded if the user
cancel the deletion of an event. It clears the array of events to
delete.
(onCalendarSelectEvent): don't clear the selection if the
contextual menu is going to appear.
2010-10-08 Wolfgang Sourdeau <wsourdeau@inverse.ca> 2010-10-08 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/WebServerResources/ContactsUI.js: (setEventsOnAddressBook) * UI/WebServerResources/ContactsUI.js: (setEventsOnAddressBook)

36
UI/WebServerResources/SchedulerUI.js
View File

@ -270,7 +270,8 @@ function deleteEvent() {
eventsToDelete.push(sortedNodes[calendars[i]]); eventsToDelete.push(sortedNodes[calendars[i]]);
} }
if (i > 0) if (i > 0)
showConfirmDialog(_("Warning"), _("eventDeleteConfirmation"), deleteEventFromViewConfirm); showConfirmDialog(_("Warning"), _("eventDeleteConfirmation"),
deleteEventFromViewConfirm, deleteEventFromViewCancel);
else else
showAlertDialog(_("You don't have the required privileges to perform the operation.")); showAlertDialog(_("You don't have the required privileges to perform the operation."));
} }
@ -302,6 +303,12 @@ function deleteEventFromViewConfirm() {
disposeDialog(); disposeDialog();
} }
function deleteEventFromViewCancel(event) {
calendarsOfEventsToDelete = [];
eventsToDelete = [];
disposeDialog();
}
function copyEventToClipboard() { function copyEventToClipboard() {
if (listOfSelection) { if (listOfSelection) {
clipboard = new Array(); clipboard = new Array();
@ -1862,7 +1869,7 @@ function onListFilterChange() {
var node = $("filterpopup"); var node = $("filterpopup");
listFilter = node.value; listFilter = node.value;
// log ("listFilter = " + listFilter); // log ("listFilter = " + listFilter);
return refreshEvents(); return refreshEvents();
} }
@ -2000,7 +2007,7 @@ function deselectAll(cellsOnly) {
} }
} }
function onCalendarSelectEvent(event) { function onCalendarSelectEvent(event, willShowContextualMenu) {
var alreadySelected = false; var alreadySelected = false;
// Look for event in events list // Look for event in events list
@ -2026,13 +2033,16 @@ function onCalendarSelectEvent(event) {
selectedCalendarCell.splice(i, 1); selectedCalendarCell.splice(i, 1);
if (row) if (row)
row.deselect(); row.deselect();
return true; return true;
} }
} }
else if (event.shiftKey == 0) { else if (!(alreadySelected && willShowContextualMenu)
// Unselect entries in events list and calendar view && event.shiftKey == 0) {
listOfSelection = $("eventsList"); // Unselect entries in events list and calendar view, unless :
// - Shift key is pressed;
// - Or right button is clicked and event is already selected.
listOfSelection = null;
deselectAll(); deselectAll();
this.selectElement(); this.selectElement();
if (alreadySelected) if (alreadySelected)
@ -2053,9 +2063,14 @@ function onCalendarSelectEvent(event) {
function onCalendarSelectDay(event) { function onCalendarSelectDay(event) {
var day = this.getAttribute("day"); var day = this.getAttribute("day");
var needRefresh = (listFilter == 'view_selectedday' && day != currentDay);
setSelectedDayDate(day); setSelectedDayDate(day);
changeDateSelectorDisplay(day); changeDateSelectorDisplay(day);
if (needRefresh)
refreshEvents();
var target = Event.findElement(event); var target = Event.findElement(event);
var div = target.up('div'); var div = target.up('div');
if (div && !div.hasClassName('event') && !div.hasClassName('eventInside') && !div.hasClassName('text') && !div.hasClassName('gradient')) { if (div && !div.hasClassName('event') && !div.hasClassName('eventInside') && !div.hasClassName('text') && !div.hasClassName('gradient')) {
@ -2067,16 +2082,11 @@ function onCalendarSelectDay(event) {
return false; return false;
} }
var needRefresh = (listFilter == 'view_selectedday' && day != currentDay);
if (listOfSelection) { if (listOfSelection) {
listOfSelection.addClassName("_unfocused"); listOfSelection.addClassName("_unfocused");
listOfSelection = null; listOfSelection = null;
} }
if (needRefresh)
refreshEvents();
changeCalendarDisplay( { "day": currentDay } ); changeCalendarDisplay( { "day": currentDay } );
} }
@ -2381,7 +2391,7 @@ function onMenuCurrentView(event) {
$("eventDialog").hide(); $("eventDialog").hide();
if (this.hasClassName('event')) { if (this.hasClassName('event')) {
var onClick = onCalendarSelectEvent.bind(this); var onClick = onCalendarSelectEvent.bind(this);
onClick(event); onClick(event, true);
} }
popupMenu(event, 'currentViewMenu', this); popupMenu(event, 'currentViewMenu', this);
} }