Bug 488627 - Datepicker doesn't work with some short date formats. r=enn

This commit is contained in:
Mike Conley 2011-10-05 17:26:11 -04:00
Родитель d41e5626c9
Коммит 17dc27177b
1 изменённых файлов: 14 добавлений и 8 удалений

Просмотреть файл

@ -791,6 +791,15 @@
<method name="_init">
<body>
<![CDATA[
// We'll default to YYYY/MM/DD to start.
var yfield = "input-one";
var mfield = "input-two";
var dfield = "input-three";
var twoDigitYear = false;
this.yearLeadingZero = true;
this.monthLeadingZero = true;
this.dateLeadingZero = true;
var numberOrder = /^(\D*)\s*(\d+)(\D*)(\d+)(\D*)(\d+)\s*(\D*)$/;
var dt = new Date(2002,9,4).toLocaleFormat("%x");
@ -799,11 +808,8 @@
this._separatorFirst.value = numberFields[3];
this._separatorSecond.value = numberFields[5];
var twoDigitYear = false;
var yfield = "input-one";
var mfield = "input-two";
var dfield = "input-three";
var yi = 2, mi = 4, di = 6;
for (var i = 1; i < numberFields.length; i++) {
switch (Number(numberFields[i])) {
case 2:
@ -825,6 +831,10 @@
break;
}
}
this.yearLeadingZero = (numberFields[yi].length > 1);
this.monthLeadingZero = (numberFields[mi].length > 1);
this.dateLeadingZero = (numberFields[di].length > 1);
}
this.yearField = document.getAnonymousElementByAttribute(this, "anonid", yfield);
@ -834,10 +844,6 @@
this.monthField = document.getAnonymousElementByAttribute(this, "anonid", mfield);
this.dateField = document.getAnonymousElementByAttribute(this, "anonid", dfield);
this.yearLeadingZero = (numberFields[yi].length > 1);
this.monthLeadingZero = (numberFields[mi].length > 1);
this.dateLeadingZero = (numberFields[di].length > 1);
this._fieldAMPM.parentNode.collapsed = true;
this.yearField.size = twoDigitYear ? 2 : 4;
this.yearField.maxLength = twoDigitYear ? 2 : 4;