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

[XForms] Support dayTimeDuration type for range. Bug 372739, p=msterlin r=surkov+aaronr

This commit is contained in:
aaronr%us.ibm.com 2007-04-15 07:58:46 +00:00
Родитель f31b11c408
Коммит af4ecf47f2
3 изменённых файлов: 516 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

448
extensions/xforms/resources/content/widgets-xul.xml
Просмотреть файл

@ -498,7 +498,7 @@
<![CDATA[
if (typeof val == "number") {
this.setAttribute("min", val);
if (this.value < val)
if (this.value <= val)
this._validateValue(val, false);
}
return val;
@ -516,10 +516,10 @@
if (typeof val != "number")
return val;
var min = this.min;
if (val < min)
if (val <= min)
val = min;
this.setAttribute("max", val);
if (this.value > val)
if (this.value >= val)
this._validateValue(val, false);
return val;
]]>
@ -637,9 +637,9 @@
// maximum on decrement events.
var wrapAround = this.wrapAround &&
min != -Infinity && max != Infinity;
if (aValue < min)
if (aValue <= min)
aValue = (aIsIncDec && wrapAround ? max : min);
else if (aValue > max)
else if (aValue >= max)
aValue = (aIsIncDec && wrapAround ? min : max);
// Round the value to specified number of decimal places.
@ -2043,5 +2043,443 @@
</implementation>
</binding>
<!-- DAYTIMEDURATION RANGE-->
<binding id="range-daytimeduration"
extends="chrome://xforms/content/widgets.xml#daytimeduration">
<resources>
<stylesheet src="chrome://xforms/skin/widgets-xul.css"/>
</resources>
<content>
<xul:label value="" anonid="minLabel"/>
<xul:box class="range-box">
<xul:label control="daySpin" value="&xforms.date.day.label;"/>
<xul:textbox type="number" size="1" anonid="daySpin"
xbl:inherits="tabindex=mozType:tabindex"/>
</xul:box>
<xul:box class="range-box">
<xul:label control="hoursSpin" value="&xforms.time.hours.label;"/>
<xul:textbox type="number" size="1" anonid="hoursSpin"
xbl:inherits="tabindex=mozType:tabindex"/>
</xul:box>
<xul:box class="range-box">
<xul:label control="minutesSpin" value="&xforms.time.minutes.label;"/>
<xul:textbox type="number" size="1" anonid="minutesSpin"
xbl:inherits="tabindex=mozType:tabindex"/>
</xul:box>
<xul:box class="range-box">
<xul:label control="secondsSpin" value="&xforms.time.seconds.label;"/>
<xul:textbox type="number" size="1" anonid="secondsSpin"
xbl:inherits="tabindex=mozType:tabindex"/>
</xul:box>
<xul:label value="" anonid="maxLabel"/>
</content>
<implementation>
<method name="updateLabels">
<body>
<![CDATA[
this.minLabel.value = this.start + this._startSeparator;
this.maxLabel.value = this._endSeparator + this.end;
]]>
</body>
</method>
<method name="updateValue">
<body>
<![CDATA[
var days = this.daySpin.value.toString();
var hours = this.hoursSpin.value.toString();
var minutes = this.minutesSpin.value.toString();
var seconds = this.secondsSpin.value.toString();
var duration = "P" + days + "DT" + hours + "H" +
minutes + "M" + seconds + "S";
this.setAttribute("value", duration);
]]>
</body>
</method>
<method name="updateFields">
<body>
<![CDATA[
var value = this.value;
this.daySpin.value = this.getDays(value);
this.hoursSpin.value = this.getHours(value);
this.minutesSpin.value = this.getMinutes(value);
this.secondsSpin.value = this.getSeconds(value);
]]>
</body>
</method>
<method name="setSpinbuttonMinMax">
<body>
<![CDATA[
var start = this.start;
var end = this.end;
var value = this.value;
// Days
var startDays = this.getDays(start);
var endDays = this.getDays(end);
var currentDays = this.getDays(value);
// Hours
var startHours = this.getHours(start);
var endHours = this.getHours(end);
var currentHours = this.getHours(value);
// Minutes
var startMinutes = this.getMinutes(start);
var endMinutes = this.getMinutes(end);
var currentMinutes = this.getMinutes(value);
// Seconds
var startSeconds = this.getSeconds(start);
var endSeconds = this.getSeconds(end);
// Calculated min/max values for each spinbutton.
var minHours = 0;
var maxHours = 0;
var minMinutes = 0;
var maxMinutes = 0;
var minSeconds = 0;
var maxSeconds = 0;
// Min and Max for the hours spinbutton depends on the day range.
if (endDays == startDays) {
// Range is less than one full day but the days of the start
// and end are the same.
// Example: start=P0DT23H59M59S, end=P1DT20H10M25S
// OR
// The range is greater than or equal to 1 day but less than
// 2 days and the start and end days are the same.
// Example: start=P1DT0H0M0S, end=P1DT23H59M259S
// Hours range between the start and end hours.
minHours = startHours;
maxHours = endHours;
// Min and Max minutes depends on the current hours.
if (currentHours == startHours) {
if (startHours == endHours) {
// This is a simple range of minutes and seconds. Min minutes
// is the minutes of the start duration and max minutes is
// the minutes of the end duration.
// Example: start=0DT0H1M0S, end=0DT0H30M30S
minMinutes = startMinutes;
maxMinutes = endMinutes;
} else {
// Min minutes is the minutes of the start duration. Max minutes
// is the maximum number of minutes in an hour.
minMinutes = startMinutes;
maxMinutes = 59;
}
// Seconds depends on the current minutes.
if (currentMinutes == startMinutes) {
if (startMinutes == endMinutes) {
// Simple range of seconds only so min seconds is the seconds
// of the start duration and max seconds is the seconds of the
// end duration.
// Example: start=0DT0H0M10S, end=0DT0H0M20S
minSeconds = startSeconds;
maxSeconds = endSeconds;
} else {
// Current minutes is the start minutes of the start day and
// start hour. Seconds can range from the start seconds to the
// maximum number of seconds in a minute.
minSeconds = startSeconds;
maxSeconds = 59;
}
} else if (currentMinutes == endMinutes) {
// Current minutes is the end minutes of the start day and
// start hour. Seconds can range from 0 to the number of
// seconds in the end duration.
minSeconds = 0;
maxSeconds = endSeconds;
} else {
// Current minutes is between the start and end minutes of
// the start day/start hour.
minSeconds = 0;
maxSeconds = 59;
}
} else if (currentHours == endHours) {
// Current hours value is equal to the end hours. The min minutes
// is minimum number of minutes in an hour and the max minutes
// is the minutes of the end duration. The min seconds is the
// minimum number of seconds in a minute and the max seconds is
// the seconds of the end duration.
// Example: start=P1DT0H0M0S, end=P1DT1H59M59S
minMinutes = 0;
maxMinutes = endMinutes;
minSeconds = 0;
maxSeconds = endSeconds;
} else {
// Current hours value is between the start and end hours values
// of the same day. Minutes and seconds can range between their
// miminimum and maximum values.
// Example: start=P1DT0H0M0S, end=P1DT10H59M59S
minMinutes = 0;
maxMinutes = 59;
minSeconds = 0;
maxSeconds = 59;
}
} else if (endDays - startDays == 1) {
// Range is less than one full day but the days of the start
// and end are different.
// Example: start=P0D23H59M59S, end=P1D20H30M10S
// OR
// The range is greater than or equal to 1 day but less than
// 2 days and the start and end days are different.
// Example: start=P0D0H0M0S, end=P1D23H10M10S
// Example: start=P0D0H0M0S, end=P1D0H0M0S
// Hours, minutes, and seconds depend on the current day.
if (currentDays == startDays) {
// Current day value is equal to the start day.
// The min hour is the start hours and the max hours is the
// maximum number of hours in a day.
minHours = startHours;
maxHours = 23;
// Minutes can range between the minutes of the start duration
// and the maximum number of minutes in an hour.
minMinutes = startMinutes;
maxMinutes = 59;
// Seconds can range between the seconds of the start duration
// and the maximum number of seconds in a minute.
minSeconds = startSeconds;
maxSeconds = 59;
} else if (currentDays == endDays) {
// Current day value is equal to the end day.
// The min hour is the minimum number of hours in a day and the
// max hours is the hours of the end duration.
minHours = 0;
maxHours = endHours;
// Minutes and seconds depend on the current hours.
if (currentHours >= endHours) {
// Current hour is the end hour of the end day.
minMinutes = 0;
maxMinutes = endMinutes;
if (currentMinutes >= endMinutes) {
// Current minutes is greater than or equal to the end
// minutes of the end day. Seconds can range between the
// minimum number of seconds in a minute to the seconds of
// the end duration.
minSeconds = 0;
maxSeconds = endSeconds;
} else {
// Current minutes is between the start and end minutes of
// the current hour. Seconds range between their minimum and
// maximum values.
minSeconds = 0;
maxSeconds = 59;
}
} else {
// Current hours is between the start and end hours of the
// end day. Minutes and seconds can range between their
// minimum and maximum values.
minMinutes = 0;
maxMinutes = 59;
minSeconds = 0;
maxSeconds = 59;
}
}
} else {
// Range is more than one full day.
// Example: start= P1DT10H59M59S, end=P3DT23H30M10S
// Example: start= P1DT0H0M0S, end=P3DT0H0M0S
if (currentDays == startDays) {
// Min hours is the start hours and max hours is the maximum
// number of hours in a day.
// on the end hours.
minHours = startHours;
maxHours = 23;
// Minutes depends on the current hour.
if (currentHours == startHours) {
// Current hours is equal to the start hours. Minutes range
// from the start minutes to the maximum number of minutes
// in an hour.
minMinutes = startMinutes;
maxMinutes = 59;
// Seconds depends on the current minutes.
if (currentMinutes == startMinutes) {
// Current minutes is equal to the start minutes. Seconds
// range from the start seconds to the maximum number of
// seconds in a minute.
minSeconds = startSeconds;
maxSeconds = 59;
} else {
// Current minutes is between the start and end minutes of
// the current hour. Seconds range between their minimum
// and maximum values.
minSeconds = 0;
maxSeconds = 59;
}
} else {
// Current hours is between the start and end hours of the
// current day. Minutes and seconds range between their minimum
// and maximum values.
minMinutes = 0;
maxMinutes = 59;
minSeconds = 0;
maxSeconds = 59;
}
} else if (currentDays == endDays) {
// Current day is equal to the end day.
// Hours range between the minimum number of hours in a day and
// the hours of the end duration.
minHours = 0;
maxHours = endHours;
// Minutes depend on the current hour.
if (currentHours == endHours) {
// Current hour is equal to the end hour. Minutes range between
// the minimum number of minutes in an hour and the minutes of
// the end duration.
minMinutes = 0;
maxMinutes = endMinutes;
// Seconds depends on the current minutes.
if (currentMinutes >= endMinutes) {
// Current minutes is greater than or equal to the end
// minutes of the end day. Seconds range between the minimum
// number of seconds in a minute and the seconds of the end
// duration.
minSeconds = 0;
maxSeconds = endSeconds;
} else {
// Current minutes is between the start and end minutes of
// the current hour. Seconds range between their minimum and
// maximum values.
minSeconds = 0;
maxSeconds = 59;
}
} else {
// Current hours is between the start and end hours of the
// end day. Minutes and seconds range between their minimum
// and maximum values.
minMinutes = 0;
maxMinutes = 59;
minSeconds = 0;
maxSeconds = 59;
}
} else {
// Current day falls between the start and end days. Hours,
// minutes, and seconds all range between their minimum and
// maximum values.
minHours = 0;
maxHours = 23;
minMinutes = 0;
maxMinutes = 59;
minSeconds = 0;
maxSeconds = 59;
}
}
// Set the min and max for the days, hours, minutes,
// and seconds spinbuttons.
this.daySpin.min = startDays;
this.daySpin.max = endDays;
this.hoursSpin.min = minHours;
this.hoursSpin.max = maxHours;
this.minutesSpin.min = minMinutes;
this.minutesSpin.max = maxMinutes;
this.secondsSpin.min = minSeconds;
this.secondsSpin.max = maxSeconds;
]]>
</body>
</method>
<method name="isInRange">
<parameter name="aValue"/>
<body>
<![CDATA[
var startSeconds = this.getDurationSeconds(this.start);
var endSeconds = this.getDurationSeconds(this.end);
var currentSeconds = this.getDurationSeconds(aValue);
return startSeconds <= currentSeconds && currentSeconds <= endSeconds;
]]>
</body>
</method>
<!-- Private -->
<property name="minLabel" readonly="true">
<getter>
if (!this._minLabel) {
this._minLabel = this.ownerDocument.
getAnonymousElementByAttribute(this, "anonid", "minLabel");
}
return this._minLabel;
</getter>
</property>
<field name="_minLabel">null</field>
<property name="daySpin" readonly="true">
<getter>
if (!this._daySpin) {
this._daySpin = this.ownerDocument.
getAnonymousElementByAttribute(this, "anonid", "daySpin");
}
return this._daySpin;
</getter>
</property>
<field name="_daySpin">null</field>
<property name="hoursSpin" readonly="true">
<getter>
if (!this._hoursSpin) {
this._hoursSpin = this.ownerDocument.
getAnonymousElementByAttribute(this, "anonid", "hoursSpin");
}
return this._hoursSpin;
</getter>
</property>
<field name="_hoursSpin">null</field>
<property name="minutesSpin" readonly="true">
<getter>
if (!this._minutesSpin) {
this._minutesSpin = this.ownerDocument.
getAnonymousElementByAttribute(this, "anonid", "minutesSpin");
}
return this._minutesSpin;
</getter>
</property>
<field name="_minutesSpin">null</field>
<property name="secondsSpin" readonly="true">
<getter>
if (!this._secondsSpin) {
this._secondsSpin = this.ownerDocument.
getAnonymousElementByAttribute(this, "anonid", "secondsSpin");
}
return this._secondsSpin;
</getter>
</property>
<field name="_secondsSpin">null</field>
<property name="maxLabel" readonly="true">
<getter>
if (!this._maxLabel) {
this._maxLabel = this.ownerDocument.
getAnonymousElementByAttribute(this, "anonid", "maxLabel");
}
return this._maxLabel;
</getter>
</property>
<field name="_maxLabel">null</field>
</implementation>
</binding>
</bindings>

64
extensions/xforms/resources/content/widgets.xml
Просмотреть файл

@ -1697,4 +1697,68 @@
</implementation>
</binding>
<!-- DAYTIMEDURATION -->
<binding id="daytimeduration" extends="#duration">
<implementation>
<!-- interface -->
<!-- dayTimeDuration format: PnDTnHnMnS (days, hours, minutes, seconds). -->
<!-- Format a dayTimeDuration to the format PnDTnHnMnS so that we have a
whole number of days, hours are between 0 - 23, minutes are between
0 - 59, and seconds are between 0 - 59.
If aDuration is null, this method will return a dayTimeDuration of
zero days, zero hours, zero minutes, and zero seconds (P0DT0H0M0S).
-->
<method name="formatDuration">
<parameter name="aDuration"/>
<body>
<![CDATA[
var days = this.getDays(aDuration);
var hours = this.getHours(aDuration);
var minutes = this.getMinutes(aDuration);
var seconds = this.getSeconds(aDuration);
// If the seconds value exceeds 60, allocate the number of
// minutes in the seconds to the minutes value.
minutes = minutes + Math.floor(seconds / 60);
seconds = seconds % 60;
// If the minutes value now exceeds 60, allocate the number of
// hours in the minutes to the hours value.
hours = hours + Math.floor(minutes / 60);
minutes = minutes % 60;
// If the hours value now exceeds 23, allocate the number of
// days in the hours to the days value.
days = days + Math.floor(hours / 24);
hours = hours % 24;
return "P" + days + "DT" + hours + "H" + minutes + "M" + seconds + "S";
]]>
</body>
</method>
<!-- Get the total number of seconds in a dayTimeDuration -->
<method name="getDurationSeconds">
<parameter name="aDuration"/>
<body>
<![CDATA[
var days = this.getDays(aDuration);
var hours = this.getHours(aDuration);
var minutes = this.getMinutes(aDuration);
var seconds = this.getSeconds(aDuration);
var durationSeconds = (days * 86400) +
(hours * 3600) +
(minutes * 60) +
seconds;
return durationSeconds;
]]>
</body>
</method>
</implementation>
</binding>
</bindings>

10
extensions/xforms/resources/content/xforms.css
Просмотреть файл

@ -272,7 +272,9 @@ html|*:root range[mozType|typelist~="http://www.w3.org/2001/XMLSchema#gYear"],
xul|*:root range[mozType|typelist~="http://www.w3.org/2001/XMLSchema#gYearMonth"],
html|*:root range[mozType|typelist~="http://www.w3.org/2001/XMLSchema#gYearMonth"],
xul|*:root range[mozType|type="http://www.w3.org/2002/xforms#yearMonthDuration"],
html|*:root range[mozType|type="http://www.w3.org/2002/xforms#yearMonthDuration"] {
html|*:root range[mozType|type="http://www.w3.org/2002/xforms#yearMonthDuration"],
xul|*:root range[mozType|type="http://www.w3.org/2002/xforms#dayTimeDuration"],
html|*:root range[mozType|type="http://www.w3.org/2002/xforms#dayTimeDuration"] {
-moz-binding: url('chrome://xforms/content/range-xul.xml#xformswidget-range-datesandtimes');
}
@ -330,6 +332,12 @@ html|*:root range[mozType|type="http://www.w3.org/2002/xforms#yearMonthDuration"
-moz-binding: url('chrome://xforms/content/widgets-xul.xml#range-yearmonthduration');
}
/* range type="xf:dayTimeDuration" */
xul|*:root range[mozType|type="http://www.w3.org/2002/xforms#dayTimeDuration"] > xul|box,
html|*:root range[mozType|type="http://www.w3.org/2002/xforms#dayTimeDuration"] > xul|box {
-moz-binding: url('chrome://xforms/content/widgets-xul.xml#range-daytimeduration');
}
range xul|box.xf-value {
-moz-box-align: end;
-moz-box-orient: horizontal;