Fix bugs #48321 and #51168: JS code from gervase.markham@univ.ox.ac.uk and r=me
git-svn-id: svn://10.0.0.236/trunk@78101 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
cbec54eb6e
commit
bfffaf70d2
@ -319,7 +319,7 @@ function Commit()
|
||||
endHourRange = endHourRangeNode.selectedItem.getAttribute("data");
|
||||
}
|
||||
|
||||
if (startHourRange > endHourRange)
|
||||
if (parseInt(startHourRange) > parseInt(endHourRange))
|
||||
{
|
||||
var temp = startHourRange;
|
||||
startHourRange = endHourRange;
|
||||
@ -414,3 +414,48 @@ function updateAttribute(prop, oldvalue, newvalue)
|
||||
return(changed);
|
||||
}
|
||||
|
||||
|
||||
|
||||
function setEndHourRange()
|
||||
{
|
||||
// Get the values of the start-time and end-time as ints
|
||||
var startHourRange = "";
|
||||
var startHourRangeNode = document.getElementById("startHourRange");
|
||||
if (startHourRangeNode)
|
||||
{
|
||||
startHourRange = startHourRangeNode.selectedItem.getAttribute("data");
|
||||
var startHourRangeInt = parseInt(startHourRange);
|
||||
}
|
||||
var endHourRange = "";
|
||||
var endHourRangeNode = document.getElementById("endHourRange");
|
||||
if (endHourRangeNode)
|
||||
{
|
||||
endHourRange = endHourRangeNode.selectedItem.getAttribute("data");
|
||||
var endHourRangeInt = parseInt(endHourRange);
|
||||
}
|
||||
|
||||
if (endHourRangeNode)
|
||||
{
|
||||
var endHourItemNode = endHourRangeNode.firstChild.firstChild;
|
||||
|
||||
if (endHourItemNode) {
|
||||
|
||||
// disable all those end-times before the start-time
|
||||
for (var index = 0; index < startHourRangeInt; index++) {
|
||||
endHourItemNode.setAttribute("disabled", "true");
|
||||
endHourItemNode = endHourItemNode.nextSibling;
|
||||
}
|
||||
|
||||
// update the selected value if it's out of the allowed range
|
||||
if (startHourRangeInt >= endHourRangeInt) {
|
||||
endHourRangeNode.selectedItem = endHourItemNode;
|
||||
}
|
||||
|
||||
// make sure all the end-times after the start-time are enabled
|
||||
for (; index < 24; index++) {
|
||||
endHourItemNode.removeAttribute("disabled");
|
||||
endHourItemNode = endHourItemNode.nextSibling;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -93,7 +93,7 @@
|
||||
</menulist>
|
||||
<spring align="horizontal" flex="1" />
|
||||
<text class="label" value="&from.label;" />
|
||||
<menulist id="startHourRange">
|
||||
<menulist id="startHourRange" oncommand="setEndHourRange()">
|
||||
<menupopup>
|
||||
<menuitem data="0" value="&midnight.label;"/>
|
||||
<menuitem data="1" value="&AMone.label;"/>
|
||||
@ -126,7 +126,7 @@
|
||||
<spring align="horizontal" flex="1" />
|
||||
<text value="&to.label;" />
|
||||
<menulist id="endHourRange">
|
||||
<menupopup>
|
||||
<menupopup oncreate="setEndHourRange()">
|
||||
<menuitem data="1" value="&AMone.label;"/>
|
||||
<menuitem data="2" value="&AMtwo.label;"/>
|
||||
<menuitem data="3" value="&AMthree.label;"/>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user