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

Fixing js warnings, and a fix for bug 109262.

This commit is contained in:
mikep%oeone.com 2002-01-31 19:00:00 +00:00
Родитель 7b34209a7b
Коммит 617b0d204e
6 изменённых файлов: 44 добавлений и 40 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -112,8 +112,8 @@ function loadCalendarEventDialog()
gMode = args.mode;
if( args.CategoryManager )
gCategoryManager = args.CategoryManager;
//if( args.CategoryManager )
// gCategoryManager = args.CategoryManager;
// remember function to call when OK is clicked
@ -198,8 +198,8 @@ function loadCalendarEventDialog()
setFieldValue( "alarm-checkbox", gEvent.alarm, "checked" );
setFieldValue( "alarm-length-field", gEvent.alarmLength );
setFieldValue( "alarm-length-units", gEvent.alarmUnits, "data" );
setFieldValue( "alarm-length-units", gEvent.alarmUnits, "value" );
setFieldValue( "alarm-length-units", gEvent.alarmUnits );
if ( gEvent.alarmEmailAddress && gEvent.alarmEmailAddress != "" )
{
setFieldValue( "alarm-email-checkbox", true, "checked" );
@ -233,6 +233,8 @@ function loadCalendarEventDialog()
updateAlarmItemEnabled();
updateInviteItemEnabled();
//updateAlarmEmailItemEnabled();
/*
** set the advanced weekly repeating stuff
*/
@ -310,7 +312,7 @@ function onOKCommand()
gEvent.alarmEmailAddress = "";
}
gEvent.recur = getFieldValue( "repeat-checkbox", "checked" );
gEvent.recurUnits = getFieldValue( "repeat-length-units", "value" );
gEvent.recurUnits = getFieldValue( "repeat-length-units", "value" );
gEvent.recurForever = getFieldValue( "repeat-forever-radio", "checked" );
gEvent.recurInterval = getFieldValue( "repeat-length-field" );
@ -677,6 +679,7 @@ function updateRepeatItemEnabled()
updateUntilItemEnabled();
// extra interface depending on units
updateRepeatUnitExtensions();
}
@ -765,7 +768,7 @@ function updateUntilItemEnabled()
var repeatEndText = document.getElementById( "repeat-end-date-text" );
var repeatEndPicker = document.getElementById( "repeat-end-date-button" );
//RADIO REQUIRES SELECTED NOT CHECKED
if( repeatCheckBox.checked && repeatUntilRadio.selected )
{
@ -912,7 +915,7 @@ function setAdvancedWeekRepeat()
if( gEvent.recurWeekdays > 0 )
{
for( i = 0; i < 6; i++ )
for( var i = 0; i < 6; i++ )
{
dump( gEvent.recurWeekdays | eval( "kRepeatDay_"+i ) );
@ -947,7 +950,7 @@ function getAdvancedWeekRepeat()
{
var Total = 0;
for( i = 0; i < 7; i++ )
for( var i = 0; i < 7; i++ )
{
if( getFieldValue( "advanced-repeat-week-"+i, "checked" ) == true )
{
@ -973,7 +976,7 @@ function updateAdvancedWeekRepeat()
if( repeatCheckBox.checked )
{
//uncheck them all
for( i = 0; i < 7; i++ )
for( var i = 0; i < 7; i++ )
{
setFieldValue( "advanced-repeat-week-"+i, false, "checked" );
@ -1067,7 +1070,7 @@ function getWeekNumberOfMonth()
if( weekNumber > 3 )
{
nextWeek = new Date( getDateTimeFieldValue( "start-date-text" ).getTime() + ( 1000 * 60 * 60 * 24 * 7 ) );
var nextWeek = new Date( getDateTimeFieldValue( "start-date-text" ).getTime() + ( 1000 * 60 * 60 * 24 * 7 ) );
if( nextWeek.getMonth() != thisMonth )
{
@ -1134,8 +1137,6 @@ function setFieldValue( elementId, newValue, propertyName )
field.value = newValue;
}
}
}
}

14
calendar/resources/content/calendarEventDialog.xul
Просмотреть файл

@ -223,13 +223,13 @@
<hbox id="alarm-box">
<checkbox id="alarm-checkbox" label="&newevent.alarm.label;" checked="false" oncommand="commandAlarm()"/>
<spacer id="alarm-spacer" />
<textbox id="alarm-length-field" oninput="alarmLengthKeyDown( this )" value="15" />
<textbox id="alarm-length-field" oninput="alarmLengthKeyDown( this )"/>
<menulist id="alarm-length-units" flex="1" labelnumber="labelplural" crop="none" label="&alarm.units.minutes;" value="minutes" >
<menupopup >
<menuitem label="&alarm.units.minutes;" labelplural="&alarm.units.minutes;" labelsingular="&alarm.units.minutes.singular;" crop="none" value="minutes"/>
<menuitem label="&alarm.units.hours;" labelplural="&alarm.units.hours;" labelsingular="&alarm.units.hours.singular;" crop="none" value="hours"/>
<menuitem label="&alarm.units.days;" labelplural="&alarm.units.days;" labelsingular="&alarm.units.days.singular;" crop="none" value="days"/>
<menulist id="alarm-length-units" labelnumber="labelplural">
<menupopup>
<menuitem label="&alarm.units.minutes;" labelplural="&alarm.units.minutes;" labelsingular="&alarm.units.minutes.singular;" value="minutes"/>
<menuitem label="&alarm.units.hours;" labelplural="&alarm.units.hours;" labelsingular="&alarm.units.hours.singular;" value="hours" />
<menuitem label="&alarm.units.days;" labelplural="&alarm.units.days;" labelsingular="&alarm.units.days.singular;" value="days"/>
</menupopup>
</menulist>
@ -263,7 +263,7 @@
<checkbox id="repeat-checkbox" label="&newevent.repeat.label;" checked="false" oncommand="commandRepeat()"/>
<textbox id="repeat-length-field" disable-controller="repeat" value="1" oninput="repeatLengthKeyDown( this )"/>
<menulist crop="never" oncommand="repeatUnitCommand( this )" labelnumber="labelplural" id="repeat-length-units" disable-controller="repeat">
<menulist crop="none" oncommand="repeatUnitCommand( this )" labelnumber="labelplural" id="repeat-length-units" disable-controller="repeat">
<menupopup>
<menuitem label="&repeat.units.days;" labelplural="&repeat.units.days;" labelsingular="&repeat.units.days.singular;" value="days" />
<menuitem label="&repeat.units.weeks;" labelplural="&repeat.units.weeks;" labelsingular="&repeat.units.weeks.singular;" selected="true" value="weeks" />

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

@ -770,7 +770,8 @@ MonthView.prototype.clearSelectedEvent = function ( )
MonthView.prototype.getVisibleEvent = function( calendarEvent )
{
eventBox = document.getElementById( "month-view-event-box-"+calendarEvent.id );
var eventBox = document.getElementById( "month-view-event-box-"+calendarEvent.id );
if ( eventBox )
{
return eventBox;

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

@ -112,8 +112,8 @@ function loadCalendarEventDialog()
gMode = args.mode;
if( args.CategoryManager )
gCategoryManager = args.CategoryManager;
//if( args.CategoryManager )
// gCategoryManager = args.CategoryManager;
// remember function to call when OK is clicked
@ -198,8 +198,8 @@ function loadCalendarEventDialog()
setFieldValue( "alarm-checkbox", gEvent.alarm, "checked" );
setFieldValue( "alarm-length-field", gEvent.alarmLength );
setFieldValue( "alarm-length-units", gEvent.alarmUnits, "data" );
setFieldValue( "alarm-length-units", gEvent.alarmUnits, "value" );
setFieldValue( "alarm-length-units", gEvent.alarmUnits );
if ( gEvent.alarmEmailAddress && gEvent.alarmEmailAddress != "" )
{
setFieldValue( "alarm-email-checkbox", true, "checked" );
@ -233,6 +233,8 @@ function loadCalendarEventDialog()
updateAlarmItemEnabled();
updateInviteItemEnabled();
//updateAlarmEmailItemEnabled();
/*
** set the advanced weekly repeating stuff
*/
@ -310,7 +312,7 @@ function onOKCommand()
gEvent.alarmEmailAddress = "";
}
gEvent.recur = getFieldValue( "repeat-checkbox", "checked" );
gEvent.recurUnits = getFieldValue( "repeat-length-units", "value" );
gEvent.recurUnits = getFieldValue( "repeat-length-units", "value" );
gEvent.recurForever = getFieldValue( "repeat-forever-radio", "checked" );
gEvent.recurInterval = getFieldValue( "repeat-length-field" );
@ -677,6 +679,7 @@ function updateRepeatItemEnabled()
updateUntilItemEnabled();
// extra interface depending on units
updateRepeatUnitExtensions();
}
@ -765,7 +768,7 @@ function updateUntilItemEnabled()
var repeatEndText = document.getElementById( "repeat-end-date-text" );
var repeatEndPicker = document.getElementById( "repeat-end-date-button" );
//RADIO REQUIRES SELECTED NOT CHECKED
if( repeatCheckBox.checked && repeatUntilRadio.selected )
{
@ -912,7 +915,7 @@ function setAdvancedWeekRepeat()
if( gEvent.recurWeekdays > 0 )
{
for( i = 0; i < 6; i++ )
for( var i = 0; i < 6; i++ )
{
dump( gEvent.recurWeekdays | eval( "kRepeatDay_"+i ) );
@ -947,7 +950,7 @@ function getAdvancedWeekRepeat()
{
var Total = 0;
for( i = 0; i < 7; i++ )
for( var i = 0; i < 7; i++ )
{
if( getFieldValue( "advanced-repeat-week-"+i, "checked" ) == true )
{
@ -973,7 +976,7 @@ function updateAdvancedWeekRepeat()
if( repeatCheckBox.checked )
{
//uncheck them all
for( i = 0; i < 7; i++ )
for( var i = 0; i < 7; i++ )
{
setFieldValue( "advanced-repeat-week-"+i, false, "checked" );
@ -1067,7 +1070,7 @@ function getWeekNumberOfMonth()
if( weekNumber > 3 )
{
nextWeek = new Date( getDateTimeFieldValue( "start-date-text" ).getTime() + ( 1000 * 60 * 60 * 24 * 7 ) );
var nextWeek = new Date( getDateTimeFieldValue( "start-date-text" ).getTime() + ( 1000 * 60 * 60 * 24 * 7 ) );
if( nextWeek.getMonth() != thisMonth )
{
@ -1134,8 +1137,6 @@ function setFieldValue( elementId, newValue, propertyName )
field.value = newValue;
}
}
}
}

14
calendar/resources/content/eventDialog.xul
Просмотреть файл

@ -223,13 +223,13 @@
<hbox id="alarm-box">
<checkbox id="alarm-checkbox" label="&newevent.alarm.label;" checked="false" oncommand="commandAlarm()"/>
<spacer id="alarm-spacer" />
<textbox id="alarm-length-field" oninput="alarmLengthKeyDown( this )" value="15" />
<textbox id="alarm-length-field" oninput="alarmLengthKeyDown( this )"/>
<menulist id="alarm-length-units" flex="1" labelnumber="labelplural" crop="none" label="&alarm.units.minutes;" value="minutes" >
<menupopup >
<menuitem label="&alarm.units.minutes;" labelplural="&alarm.units.minutes;" labelsingular="&alarm.units.minutes.singular;" crop="none" value="minutes"/>
<menuitem label="&alarm.units.hours;" labelplural="&alarm.units.hours;" labelsingular="&alarm.units.hours.singular;" crop="none" value="hours"/>
<menuitem label="&alarm.units.days;" labelplural="&alarm.units.days;" labelsingular="&alarm.units.days.singular;" crop="none" value="days"/>
<menulist id="alarm-length-units" labelnumber="labelplural">
<menupopup>
<menuitem label="&alarm.units.minutes;" labelplural="&alarm.units.minutes;" labelsingular="&alarm.units.minutes.singular;" value="minutes"/>
<menuitem label="&alarm.units.hours;" labelplural="&alarm.units.hours;" labelsingular="&alarm.units.hours.singular;" value="hours" />
<menuitem label="&alarm.units.days;" labelplural="&alarm.units.days;" labelsingular="&alarm.units.days.singular;" value="days"/>
</menupopup>
</menulist>
@ -263,7 +263,7 @@
<checkbox id="repeat-checkbox" label="&newevent.repeat.label;" checked="false" oncommand="commandRepeat()"/>
<textbox id="repeat-length-field" disable-controller="repeat" value="1" oninput="repeatLengthKeyDown( this )"/>
<menulist crop="never" oncommand="repeatUnitCommand( this )" labelnumber="labelplural" id="repeat-length-units" disable-controller="repeat">
<menulist crop="none" oncommand="repeatUnitCommand( this )" labelnumber="labelplural" id="repeat-length-units" disable-controller="repeat">
<menupopup>
<menuitem label="&repeat.units.days;" labelplural="&repeat.units.days;" labelsingular="&repeat.units.days.singular;" value="days" />
<menuitem label="&repeat.units.weeks;" labelplural="&repeat.units.weeks;" labelsingular="&repeat.units.weeks.singular;" selected="true" value="weeks" />

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

@ -770,7 +770,8 @@ MonthView.prototype.clearSelectedEvent = function ( )
MonthView.prototype.getVisibleEvent = function( calendarEvent )
{
eventBox = document.getElementById( "month-view-event-box-"+calendarEvent.id );
var eventBox = document.getElementById( "month-view-event-box-"+calendarEvent.id );
if ( eventBox )
{
return eventBox;