Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 04:45:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing bug 167798, shouldn't add a remote calendar twice, should simply activate it.

Browse Source
This commit is contained in:
mikep%oeone.com 2002-09-16 18:17:52 +00:00
parent c37374b143
commit 777703fb0d
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,8 +157,6 @@ calendarManager.prototype.addServerDialogResponse = function calMan_addServerDia
CalendarObject.remotePath = CalendarObject.path;
CalendarObject.path = profileFile.path;
this.retrieveAndSaveRemoteCalendar( CalendarObject, onResponseAndRefresh );
dump( "Remote Calendar Number "+CalendarObject.serverNumber+" Added" );
}
else
@ -182,6 +180,8 @@ calendarManager.prototype.addServerDialogResponse = function calMan_addServerDia
this.updateServerArrayText();
this.addCalendarToListBox( CalendarObject );
this.retrieveAndSaveRemoteCalendar( CalendarObject, onResponseAndRefresh );
}
@ -478,6 +478,20 @@ calendarManager.prototype.checkCalendarURL = function calMan_checkCalendarURL( C
else
{
//calendarSubscribed is the subscribed calendar object.
if( calendarSubscribed.active == false )
{
calendarSubscribed.active = true;
gCalendarWindow.calendarManager.addCalendar( calendarSubscribed );
document.getElementById( "calendar-list-item-"+calendarSubscribed.serverNumber ).setAttribute( "checked", "true" );
refreshEventTree( false );
refreshToDoTree( false );
gCalendarWindow.currentView.refreshEvents();
}
}
}
@ -523,12 +537,16 @@ function switchCalendar( event )
if( event.currentTarget.childNodes[0].getAttribute( "checked" ) != "true" )
{
gCalendarWindow.calendarManager.addCalendar( event.currentTarget.calendarObject );
event.currentTarget.calendarObject.active = true;
event.currentTarget.childNodes[0].setAttribute( "checked", "true" )
event.currentTarget.childNodes[0].setAttribute( "checked", "true" );
}
else
{
gCalendarWindow.calendarManager.removeCalendar( event.currentTarget.calendarObject );
event.currentTarget.calendarObject.active = false;
event.currentTarget.childNodes[0].removeAttribute( "checked" );
}