Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-25 06:10:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Deleting events brings up multiple confirmation dialogs

Browse Source 
Bug 269578, patch by Matthew Willis, r=mvl
This commit is contained in:
mvl%exedo.nl 2004-11-16 19:04:33 +00:00
parent 7b325c90a4
commit 5f43167cfb
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
calendar/resources/content/calendar.js
View File

@ -25,6 +25,7 @@
* Mike Norton <xor@ivwnet.com>
* ArentJan Banck <ajbanck@planet.nl>
* Eric Belhaire <belhaire@ief.u-psud.fr>
* Matthew Willis <mattwillis@gmail.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
@ -1012,12 +1013,16 @@ function deleteEventCommand( DoNotConfirm )
if ( !DoNotConfirm )
{
var calendarEvent = SelectedItems[0];
var confirmText
if ( SelectedItems.length > 1 && !confirm( confirmDeleteAllEvents ) )
break outerLoop;
else if ( calendarEvent.title != "" && !confirm( confirmDeleteEvent+" "+calendarEvent.title+"?" ) )
break outerLoop;
else if ( !confirm( confirmDeleteUntitledEvent ) )
if ( SelectedItems.length > 1 )
confirmText = confirmDeleteAllEvents;
else if ( calendarEvent.title )
confirmText = (confirmDeleteEvent+" "+calendarEvent.title+"?" );
else
confirmText = confirmDeleteUntitledEvent;
if ( !confirm( confirmText ) )
break outerLoop;
}
@ -1056,8 +1061,13 @@ function deleteEventCommand( DoNotConfirm )
gICalLib.batchMode = true;
for( i = 0; i < SelectedItems.length; i++ )
{
gCalendarWindow.clearSelectedEvent( SelectedItems[i] );
gICalLib.deleteEvent( SelectedItems[i].id );
try {
gCalendarWindow.clearSelectedEvent( SelectedItems[i] );
gICalLib.deleteEvent( SelectedItems[i].id );
}
catch (ex) {
dump("*** deleteEventCommand failed: "+ ex + "\n");
}
}
gICalLib.batchMode = false;