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

Fixing bug 128823.

This commit is contained in:
mikep%oeone.com 2002-03-05 14:52:40 +00:00
Родитель 49f915b5a5
Коммит dc26d4f9d1
4 изменённых файлов: 20 добавлений и 28 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -209,7 +209,7 @@ function loadCalendarEventDialog()
setFieldValue( "repeat-checkbox", gEvent.recur, "checked"); setFieldValue( "repeat-checkbox", gEvent.recur, "checked");
setFieldValue( "repeat-length-field", gEvent.recurInterval ); setFieldValue( "repeat-length-field", gEvent.recurInterval );
setFieldValue( "repeat-length-units", gEvent.recurUnits, "value" ); setFieldValue( "repeat-length-units", gEvent.recurUnits ); //don't put the extra "value" element here, or it won't work.
setFieldValue( "repeat-forever-radio", (gEvent.recurForever != undefined && gEvent.recurForever != false), "selected" ); setFieldValue( "repeat-forever-radio", (gEvent.recurForever != undefined && gEvent.recurForever != false), "selected" );
setFieldValue( "repeat-until-radio", (gEvent.recurForever == undefined || gEvent.recurForever == false), "selected" ); setFieldValue( "repeat-until-radio", (gEvent.recurForever == undefined || gEvent.recurForever == false), "selected" );
@ -233,7 +233,6 @@ function loadCalendarEventDialog()
// set up OK, Cancel // set up OK, Cancel
doSetOKCancel( onOKCommand, 0 ); doSetOKCancel( onOKCommand, 0 );
// start focus on title // start focus on title
var firstFocus = document.getElementById( "title-field" ); var firstFocus = document.getElementById( "title-field" );
@ -796,34 +795,31 @@ function updateRepeatUnitExtensions( )
if( repeatMenu.selectedItem ) if( repeatMenu.selectedItem )
{ {
switch( repeatMenu.selectedItem.value ) switch( repeatMenu.selectedItem.value )
{ {
case "days": case "days":
weekExtensions.setAttribute( "collapsed", "true" ); weekExtensions.setAttribute( "collapsed", "true" );
monthExtensions.setAttribute( "collapsed", "true" ); monthExtensions.setAttribute( "collapsed", "true" );
sizeToContent();
break; break;
case "weeks": case "weeks":
weekExtensions.setAttribute( "collapsed", "false" ); weekExtensions.setAttribute( "collapsed", "false" );
monthExtensions.setAttribute( "collapsed", "true" ); monthExtensions.setAttribute( "collapsed", "true" );
updateAdvancedWeekRepeat(); updateAdvancedWeekRepeat();
sizeToContent();
break; break;
case "months": case "months":
weekExtensions.setAttribute( "collapsed", "true" ); weekExtensions.setAttribute( "collapsed", "true" );
monthExtensions.setAttribute( "collapsed", "false" ); monthExtensions.setAttribute( "collapsed", "false" );
updateAdvancedRepeatDayOfMonth(); updateAdvancedRepeatDayOfMonth();
sizeToContent();
break; break;
case "years": case "years":
weekExtensions.setAttribute( "collapsed", "true" ); weekExtensions.setAttribute( "collapsed", "true" );
monthExtensions.setAttribute( "collapsed", "true" ); monthExtensions.setAttribute( "collapsed", "true" );
sizeToContent();
break; break;
} }
sizeToContent();
} }
} }

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

@ -247,10 +247,10 @@
<menulist crop="none" 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> <menupopup>
<menuitem label="&repeat.units.days;" labelplural="&repeat.units.days;" labelsingular="&repeat.units.days.singular;" value="days" /> <menuitem label="&repeat.units.days;" labelplural="&repeat.units.days;" labelsingular="&repeat.units.days.singular;" id="repeat-length-days" value="days" />
<menuitem label="&repeat.units.weeks;" labelplural="&repeat.units.weeks;" labelsingular="&repeat.units.weeks.singular;" selected="true" value="weeks" /> <menuitem label="&repeat.units.weeks;" labelplural="&repeat.units.weeks;" labelsingular="&repeat.units.weeks.singular;" id="repeat-length-weeks" value="weeks" selected="true" />
<menuitem label="&repeat.units.months;" labelplural="&repeat.units.months;" labelsingular="&repeat.units.months.singular;" value="months" /> <menuitem label="&repeat.units.months;" labelplural="&repeat.units.months;" labelsingular="&repeat.units.months.singular;" id="repeat-length-months" value="months" />
<menuitem label="&repeat.units.years;" labelplural="&repeat.units.years;" labelsingular="&repeat.units.years.singular;" value="years" /> <menuitem label="&repeat.units.years;" labelplural="&repeat.units.years;" labelsingular="&repeat.units.years.singular;" id="repeat-length-years" value="years" />
</menupopup> </menupopup>
</menulist> </menulist>
</hbox> </hbox>
@ -272,8 +272,8 @@
<spacer class="repeat-left-spacer" /> <spacer class="repeat-left-spacer" />
<vbox> <vbox>
<radiogroup id="advanced-repeat-month" disable-controller="repeat"> <radiogroup id="advanced-repeat-month" disable-controller="repeat">
<radio group="advanced-repeat-month" disable-controller="repeat" id="advanced-repeat-dayofmonth" label="On the xth day of the month" selected="true" /> <radio group="advanced-repeat-month" disable-controller="repeat" id="advanced-repeat-dayofmonth" label="On the xth day of the month" selected="true"/>
<radio group="advanced-repeat-month" disable-controller="repeat" id="advanced-repeat-dayofweek" label="Last Tuesday of the month" selected="false" /> <radio group="advanced-repeat-month" disable-controller="repeat" id="advanced-repeat-dayofweek" label="Last Tuesday of the month"/>
</radiogroup> </radiogroup>
</vbox> </vbox>
</hbox> </hbox>

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

@ -209,7 +209,7 @@ function loadCalendarEventDialog()
setFieldValue( "repeat-checkbox", gEvent.recur, "checked"); setFieldValue( "repeat-checkbox", gEvent.recur, "checked");
setFieldValue( "repeat-length-field", gEvent.recurInterval ); setFieldValue( "repeat-length-field", gEvent.recurInterval );
setFieldValue( "repeat-length-units", gEvent.recurUnits, "value" ); setFieldValue( "repeat-length-units", gEvent.recurUnits ); //don't put the extra "value" element here, or it won't work.
setFieldValue( "repeat-forever-radio", (gEvent.recurForever != undefined && gEvent.recurForever != false), "selected" ); setFieldValue( "repeat-forever-radio", (gEvent.recurForever != undefined && gEvent.recurForever != false), "selected" );
setFieldValue( "repeat-until-radio", (gEvent.recurForever == undefined || gEvent.recurForever == false), "selected" ); setFieldValue( "repeat-until-radio", (gEvent.recurForever == undefined || gEvent.recurForever == false), "selected" );
@ -233,7 +233,6 @@ function loadCalendarEventDialog()
// set up OK, Cancel // set up OK, Cancel
doSetOKCancel( onOKCommand, 0 ); doSetOKCancel( onOKCommand, 0 );
// start focus on title // start focus on title
var firstFocus = document.getElementById( "title-field" ); var firstFocus = document.getElementById( "title-field" );
@ -796,34 +795,31 @@ function updateRepeatUnitExtensions( )
if( repeatMenu.selectedItem ) if( repeatMenu.selectedItem )
{ {
switch( repeatMenu.selectedItem.value ) switch( repeatMenu.selectedItem.value )
{ {
case "days": case "days":
weekExtensions.setAttribute( "collapsed", "true" ); weekExtensions.setAttribute( "collapsed", "true" );
monthExtensions.setAttribute( "collapsed", "true" ); monthExtensions.setAttribute( "collapsed", "true" );
sizeToContent();
break; break;
case "weeks": case "weeks":
weekExtensions.setAttribute( "collapsed", "false" ); weekExtensions.setAttribute( "collapsed", "false" );
monthExtensions.setAttribute( "collapsed", "true" ); monthExtensions.setAttribute( "collapsed", "true" );
updateAdvancedWeekRepeat(); updateAdvancedWeekRepeat();
sizeToContent();
break; break;
case "months": case "months":
weekExtensions.setAttribute( "collapsed", "true" ); weekExtensions.setAttribute( "collapsed", "true" );
monthExtensions.setAttribute( "collapsed", "false" ); monthExtensions.setAttribute( "collapsed", "false" );
updateAdvancedRepeatDayOfMonth(); updateAdvancedRepeatDayOfMonth();
sizeToContent();
break; break;
case "years": case "years":
weekExtensions.setAttribute( "collapsed", "true" ); weekExtensions.setAttribute( "collapsed", "true" );
monthExtensions.setAttribute( "collapsed", "true" ); monthExtensions.setAttribute( "collapsed", "true" );
sizeToContent();
break; break;
} }
sizeToContent();
} }
} }

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

@ -247,10 +247,10 @@
<menulist crop="none" 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> <menupopup>
<menuitem label="&repeat.units.days;" labelplural="&repeat.units.days;" labelsingular="&repeat.units.days.singular;" value="days" /> <menuitem label="&repeat.units.days;" labelplural="&repeat.units.days;" labelsingular="&repeat.units.days.singular;" id="repeat-length-days" value="days" />
<menuitem label="&repeat.units.weeks;" labelplural="&repeat.units.weeks;" labelsingular="&repeat.units.weeks.singular;" selected="true" value="weeks" /> <menuitem label="&repeat.units.weeks;" labelplural="&repeat.units.weeks;" labelsingular="&repeat.units.weeks.singular;" id="repeat-length-weeks" value="weeks" selected="true" />
<menuitem label="&repeat.units.months;" labelplural="&repeat.units.months;" labelsingular="&repeat.units.months.singular;" value="months" /> <menuitem label="&repeat.units.months;" labelplural="&repeat.units.months;" labelsingular="&repeat.units.months.singular;" id="repeat-length-months" value="months" />
<menuitem label="&repeat.units.years;" labelplural="&repeat.units.years;" labelsingular="&repeat.units.years.singular;" value="years" /> <menuitem label="&repeat.units.years;" labelplural="&repeat.units.years;" labelsingular="&repeat.units.years.singular;" id="repeat-length-years" value="years" />
</menupopup> </menupopup>
</menulist> </menulist>
</hbox> </hbox>
@ -272,8 +272,8 @@
<spacer class="repeat-left-spacer" /> <spacer class="repeat-left-spacer" />
<vbox> <vbox>
<radiogroup id="advanced-repeat-month" disable-controller="repeat"> <radiogroup id="advanced-repeat-month" disable-controller="repeat">
<radio group="advanced-repeat-month" disable-controller="repeat" id="advanced-repeat-dayofmonth" label="On the xth day of the month" selected="true" /> <radio group="advanced-repeat-month" disable-controller="repeat" id="advanced-repeat-dayofmonth" label="On the xth day of the month" selected="true"/>
<radio group="advanced-repeat-month" disable-controller="repeat" id="advanced-repeat-dayofweek" label="Last Tuesday of the month" selected="false" /> <radio group="advanced-repeat-month" disable-controller="repeat" id="advanced-repeat-dayofweek" label="Last Tuesday of the month"/>
</radiogroup> </radiogroup>
</vbox> </vbox>
</hbox> </hbox>