зеркало из https://github.com/mozilla/pjs.git
adopted wcap provider interface changes
This commit is contained in:
Родитель
743fc3f300
Коммит
855fa73438
|
@ -168,7 +168,7 @@
|
|||
|
||||
var provider = item.calendar.QueryInterface(Components.interfaces.calIWcapCalendar);
|
||||
this.mCalID = provider.calId;
|
||||
this.mUserID = provider.userId;
|
||||
this.mUserID = provider.session.userId;
|
||||
this.mOrganizerID = ((item.organizer == null || item.organizer.id == null)
|
||||
? this.mCalID // sensible default
|
||||
: item.organizer.id);
|
||||
|
@ -1447,7 +1447,7 @@
|
|||
|
||||
var provider = item.calendar.QueryInterface(Components.interfaces.calIWcapCalendar);
|
||||
this.mCalID = provider.calId;
|
||||
this.mUserID = provider.userId;
|
||||
this.mUserID = provider.session.userId;
|
||||
this.mOrganizerID = ((item.organizer == null || item.organizer.id == null)
|
||||
? this.mCalID // sensible default
|
||||
: item.organizer.id);
|
||||
|
@ -1462,7 +1462,7 @@
|
|||
organizerRow.removeAttribute("collapsed");
|
||||
var organizer = document.getAnonymousElementByAttribute(this, "anonid", "event-organizer");
|
||||
organizer.value = this.mOrganizerID;
|
||||
var props = provider.getCalendarProperties("X-S1CS-CALPROPS-COMMON-NAME",this.mOrganizerID,{});
|
||||
var props = provider.getCalendarProperties("X-S1CS-CALPROPS-COMMON-NAME",{});
|
||||
if(props.length > 0)
|
||||
organizer.value = props[0];
|
||||
}
|
||||
|
|
|
@ -519,7 +519,7 @@
|
|||
|
||||
var provider = item.calendar.QueryInterface(Components.interfaces.calIWcapCalendar);
|
||||
this.mCalID = provider.calId;
|
||||
this.mUserID = provider.userId;
|
||||
this.mUserID = provider.session.userId;
|
||||
this.mOrganizerID = ((item.organizer == null || item.organizer.id == null)
|
||||
? this.mCalID // sensible default
|
||||
: item.organizer.id);
|
||||
|
@ -1037,14 +1037,15 @@
|
|||
}
|
||||
|
||||
// can't add/edit items in readOnly calendars
|
||||
if (this.mIsReadOnly)
|
||||
this.showWarning("read-only-item");
|
||||
var cal = document.getElementById("item-calendar").selectedItem.calendar;
|
||||
if (cal.readOnly)
|
||||
this.showWarning("read-only-cal");
|
||||
if (this.mIsReadOnly || cal.readOnly) {
|
||||
enableAccept = false;
|
||||
}
|
||||
//if (this.mIsReadOnly)
|
||||
//this.showWarning("read-only-item");
|
||||
//var cal = document.getElementById("item-calendar").selectedItem.calendar;
|
||||
//if (cal.readOnly)
|
||||
//this.showWarning("read-only-cal");
|
||||
//if (this.mIsReadOnly || cal.readOnly) {
|
||||
//enableAccept = false;
|
||||
//}
|
||||
|
||||
if (!this.updateTaskAlarmWarnings()) {
|
||||
enableAccept = false;
|
||||
}
|
||||
|
|
|
@ -314,7 +314,7 @@
|
|||
|
||||
var provider = item.calendar.QueryInterface(Components.interfaces.calIWcapCalendar);
|
||||
this.mCalID = provider.calId;
|
||||
this.mUserID = provider.userId;
|
||||
this.mUserID = provider.session.userId;
|
||||
this.mOrganizerID = ((item.organizer == null || item.organizer.id == null)
|
||||
? this.mCalID // sensible default
|
||||
: item.organizer.id);
|
||||
|
|
Загрузка…
Ссылка в новой задаче