mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

bug 336766 fixes javascript error 'alarmTime has no properties'. patch by ssitter, r=mvl

This commit is contained in:
mattwillis%gmail.com 2006-05-15 22:02:53 +00:00
Родитель b2b155cc0e
Коммит 2e943e1906
5 изменённых файлов: 12 добавлений и 12 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
calendar/base/content/calendar-event-dialog.js
Просмотреть файл

@ -382,13 +382,13 @@ function saveDialog(item)
var alarmLength = getElementValue("alarm-length-field");
var alarmUnits = document.getElementById("alarm-length-units").selectedItem.value;
if (document.getElementById("alarm-trigger-relation").selectedItem.value == "START") {
item.alarmRelated = item.ALARM_RELATED_START;
item.alarmRelated = Components.interfaces.calIItemBase.ALARM_RELATED_START;
} else {
item.alarmRelated = item.ALARM_RELATED_END;
item.alarmRelated = Components.interfaces.calIItemBase.ALARM_RELATED_END;
}
var duration = Components.classes["@mozilla.org/calendar/duration;1"]
.createInstance(Components.interfaces.calIDuration);
if (item.alarmRelated == item.ALARM_RELATED_START) {
if (item.alarmRelated == Components.interfaces.calIItemBase.ALARM_RELATED_START) {
duration.isNegative = true;
}
duration[alarmUnits] = alarmLength;
@ -874,7 +874,7 @@ function loadDetails() {
/* alarms */
if (item.alarmOffset) {
var alarmRelatedStart = (item.alarmRelated == item.ALARM_RELATED_START);
var alarmRelatedStart = (item.alarmRelated == Components.interfaces.calIItemBase.ALARM_RELATED_START);
if (alarmRelatedStart) {
setElementValue("alarm-trigger-relation", "START");
} else {

4
calendar/base/src/calAlarmService.js
Просмотреть файл

@ -188,7 +188,7 @@ calAlarmService.prototype = {
alarmTime.addDuration(duration);
var datetime;
if (newEvent.alarmRelated == newEvent.ALARM_RELATED_START) {
if (newEvent.alarmRelated == Components.interfaces.calIItemBase.ALARM_RELATED_START) {
datetime = newEvent.startDate || newEvent.entryDate;
} else {
datetime = newEvent.endDate || newEvent.dueDate;
@ -324,7 +324,7 @@ calAlarmService.prototype = {
addAlarm: function(aItem) {
var alarmTime;
if (aItem.alarmRelated == aItem.ALARM_RELATED_START) {
if (aItem.alarmRelated == Components.interfaces.calIItemBase.ALARM_RELATED_START) {
alarmTime = aItem.startDate || aItem.entryDate;
} else {
alarmTime = aItem.endDate || aItem.dueDate;

4
calendar/base/src/calItemBase.js
Просмотреть файл

@ -571,9 +571,9 @@ calItemBase.prototype = {
var related = triggerProp.getParameter("RELATED");
if (related && related == "END")
this.alarmRelated = this.ALARM_RELATED_END;
this.alarmRelated = Components.interfaces.calIItemBase.ALARM_RELATED_END;
else
this.alarmRelated = this.ALARM_RELATED_START;
this.alarmRelated = Components.interfaces.calIItemBase.ALARM_RELATED_START;
var lastAck = alarmComp.getFirstProperty("X-MOZ-LASTACK");
if (lastAck) {

4
calendar/providers/storage/calStorageCalendar.js
Просмотреть файл

@ -1248,14 +1248,14 @@ calStorageCalendar.prototype = {
// transition in the future.
var alarmTime = newDateTime(row.alarm_time, row.alarm_time_tz);
var time;
var related = item.ALARM_RELATED_START;
var related = Components.interfaces.calIItemBase.ALARM_RELATED_START;
if (item instanceof Components.interfaces.calIEvent) {
time = newDateTime(row.event_start, row.event_start_tz);
} else { //tasks
if (row.todo_entry) {
time = newDateTime(row.todo_entry, row.todo_entry_tz);
} else if (row.todo_due) {
related = item.ALARM_RELATED_END;
related = Components.interfaces.calIItemBase.ALARM_RELATED_END;
time = newDateTime(row.todo_due, row.todo_due_tz);
}
}

4
calendar/resources/content/calendarUtils.js
Просмотреть файл

@ -410,7 +410,7 @@ function setDefaultAlarmValues(aItem)
alarmOffset.minutes = 15;
}
aItem.alarmOffset = alarmOffset;
aItem.alarmRelated = aItem.ALARM_RELATED_START;
aItem.alarmRelated = Components.interfaces.calIItemBase.ALARM_RELATED_START;
}
} catch (ex) {
Components.utils.reportError(
@ -432,7 +432,7 @@ function setDefaultAlarmValues(aItem)
alarmOffset.minutes = 15;
}
aItem.alarmOffset = alarmOffset;
aItem.alarmRelated = aItem.ALARM_RELATED_START;
aItem.alarmRelated = Components.interfaces.calIItemBase.ALARM_RELATED_START;
}
} catch (ex) {
Components.utils.reportError(