зеркало из https://github.com/mozilla/gecko-dev.git
fixed sign-problem with alarmOffset
This commit is contained in:
Родитель
20a20cc930
Коммит
867bfb0900
|
@ -842,11 +842,11 @@ function loadReminder(item)
|
||||||
if(item.alarmRelated == Components.interfaces.calIItemBase.ALARM_RELATED_END)
|
if(item.alarmRelated == Components.interfaces.calIItemBase.ALARM_RELATED_END)
|
||||||
origin = "-1";
|
origin = "-1";
|
||||||
var duration = item.alarmOffset.clone();
|
var duration = item.alarmOffset.clone();
|
||||||
var relation = "START";
|
var relation = "END";
|
||||||
if(duration.isNegative) {
|
if(duration.isNegative) {
|
||||||
duration.isNegative = false;
|
duration.isNegative = false;
|
||||||
duration.normalize();
|
duration.normalize();
|
||||||
relation = "END";
|
relation = "START";
|
||||||
}
|
}
|
||||||
if(menuitem.getAttribute("origin") == origin) {
|
if(menuitem.getAttribute("origin") == origin) {
|
||||||
if(menuitem.getAttribute("relation") == relation) {
|
if(menuitem.getAttribute("relation") == relation) {
|
||||||
|
@ -889,11 +889,11 @@ function loadReminder(item)
|
||||||
reminder.origin = "-1";
|
reminder.origin = "-1";
|
||||||
}
|
}
|
||||||
var offset = item.alarmOffset.clone();
|
var offset = item.alarmOffset.clone();
|
||||||
var relation = "START";
|
var relation = "END";
|
||||||
if(offset.isNegative) {
|
if(offset.isNegative) {
|
||||||
offset.isNegative = false;
|
offset.isNegative = false;
|
||||||
offset.normalize();
|
offset.normalize();
|
||||||
relation = "END";
|
relation = "START";
|
||||||
}
|
}
|
||||||
reminder.relation = relation;
|
reminder.relation = relation;
|
||||||
if (offset.minutes) {
|
if (offset.minutes) {
|
||||||
|
@ -948,7 +948,7 @@ function saveReminder(item) {
|
||||||
var duration = Components.classes["@mozilla.org/calendar/duration;1"]
|
var duration = Components.classes["@mozilla.org/calendar/duration;1"]
|
||||||
.createInstance(Components.interfaces.calIDuration);
|
.createInstance(Components.interfaces.calIDuration);
|
||||||
duration[reminder.unit] = Number(reminder.length);
|
duration[reminder.unit] = Number(reminder.length);
|
||||||
if (reminder.relation != "START") {
|
if (reminder.relation != "END") {
|
||||||
duration.isNegative = true;
|
duration.isNegative = true;
|
||||||
}
|
}
|
||||||
duration.normalize();
|
duration.normalize();
|
||||||
|
|
Загрузка…
Ссылка в новой задаче