зеркало из https://github.com/mozilla/pjs.git
Bug 328653 Alarms set for 15 or 30 min after an event show up as 15/30 minutes before. r=mvl
This commit is contained in:
Родитель
e686e7b714
Коммит
fbc27520b8
|
@ -778,7 +778,8 @@ function loadDetails() {
|
||||||
|
|
||||||
/* alarms */
|
/* alarms */
|
||||||
if (item.alarmOffset) {
|
if (item.alarmOffset) {
|
||||||
if (item.alarmRelated == item.ALARM_RELATED_START) {
|
var alarmRelatedStart = (item.alarmRelated == item.ALARM_RELATED_START);
|
||||||
|
if (alarmRelatedStart) {
|
||||||
setElementValue("alarm-trigger-relation", "START");
|
setElementValue("alarm-trigger-relation", "START");
|
||||||
} else {
|
} else {
|
||||||
setElementValue("alarm-trigger-relation", "END");
|
setElementValue("alarm-trigger-relation", "END");
|
||||||
|
@ -788,9 +789,9 @@ function loadDetails() {
|
||||||
if (offset.minutes) {
|
if (offset.minutes) {
|
||||||
var minutes = offset.minutes + offset.hours*60 + offset.days*24*60 + offset.weeks*60*24*7;
|
var minutes = offset.minutes + offset.hours*60 + offset.days*24*60 + offset.weeks*60*24*7;
|
||||||
// Special cases for the common alarms
|
// Special cases for the common alarms
|
||||||
if (minutes == 15) {
|
if ((minutes == 15) && alarmRelatedStart) {
|
||||||
document.getElementById("item-alarm").selectedIndex = 2;
|
document.getElementById("item-alarm").selectedIndex = 2;
|
||||||
} else if (minutes == 30) {
|
} else if ((minutes == 30) && alarmRelatedStart) {
|
||||||
document.getElementById("item-alarm").selectedIndex = 3;
|
document.getElementById("item-alarm").selectedIndex = 3;
|
||||||
} else {
|
} else {
|
||||||
setElementValue("alarm-length-field", minutes);
|
setElementValue("alarm-length-field", minutes);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче