Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-24 02:35:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1313795 - Remove Date.prototype.toLocaleFormat uses in toolkit/content/widgets. r=Neil

Browse Source
This commit is contained in:
André Bargull 2016-11-01 09:20:48 -07:00
parent 78d9e034fc
commit 42eeb09e2f
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
toolkit/content/tests/chrome/test_timepicker.xul
View File

@ -43,7 +43,8 @@ function testtag_timepicker()
testtag_comparetime(tp, testid + "set value", thour, tminute, tsecond);
var numberOrder = /^(\D*)\s*(\d+)(\D*)(\d+)(\D*)(\d+)\s*(\D*)$/;
var fdt = new Date(2000,0,1,16,7,9).toLocaleFormat("%X");
var locale = Intl.DateTimeFormat().resolvedOptions().locale + "-u-ca-gregory-nu-latn";
var fdt = new Date(2000,0,1,16,7,9).toLocaleTimeString(locale);
is(tp.is24HourClock, Number(fdt.match(numberOrder)[2]) > 12, "is24HourClock");
// check that setting the dateValue property works

18
toolkit/content/widgets/datetimepicker.xml
View File

@ -482,7 +482,9 @@
var numberOrder = /^(\D*)\s*(\d+)(\D*)(\d+)(\D*)(\d+)\s*(\D*)$/;
var pmTime = new Date(2000, 0, 1, 16, 7, 9).toLocaleFormat("%X");
var locale = Intl.DateTimeFormat().resolvedOptions().locale + "-u-ca-gregory-nu-latn";
var pmTime = new Date(2000, 0, 1, 16, 7, 9).toLocaleTimeString(locale);
var numberFields = pmTime.match(numberOrder);
if (numberFields) {
this._separatorFirst.value = numberFields[3];
@ -493,7 +495,7 @@
this.pmIndicator = numberFields[1] || numberFields[7];
}
var amTime = new Date(2000, 0, 1, 1, 7, 9).toLocaleFormat("%X");
var amTime = new Date(2000, 0, 1, 1, 7, 9).toLocaleTimeString(locale);
numberFields = amTime.match(numberOrder);
if (numberFields) {
this.hourLeadingZero = (numberFields[2].length > 1);
@ -770,7 +772,9 @@
var numberOrder = /^(\D*)\s*(\d+)(\D*)(\d+)(\D*)(\d+)\s*(\D*)$/;
var dt = new Date(2002, 9, 4).toLocaleFormat("%x");
var locale = Intl.DateTimeFormat().resolvedOptions().locale + "-u-ca-gregory-nu-latn";
var dt = new Date(2002, 9, 4).toLocaleDateString(locale);
var numberFields = dt.match(numberOrder);
if (numberFields) {
this._separatorFirst.value = numberFields[3];
@ -994,11 +998,15 @@
<method name="_init">
<body>
<![CDATA[
var locale = Intl.DateTimeFormat().resolvedOptions().locale + "-u-ca-gregory";
var dtfMonth = Intl.DateTimeFormat(locale, {month: "long"});
var dtfWeekday = Intl.DateTimeFormat(locale, {weekday: "narrow"});
var monthLabel = this.monthField.firstChild;
var tempDate = new Date(2005, 0, 1);
for (var month = 0; month < 12; month++) {
tempDate.setMonth(month);
monthLabel.setAttribute("value", tempDate.toLocaleFormat("%B"));
monthLabel.setAttribute("value", dtfMonth.format(tempDate));
monthLabel = monthLabel.nextSibling;
}
@ -1010,7 +1018,7 @@
var date = new Date();
date.setDate(date.getDate() - (date.getDay() - this._weekStart));
for (var i = 0; i < weekbox.length; i++) {
weekbox[i].value = date.toLocaleFormat("%a").charAt(0);
weekbox[i].value = dtfWeekday.format(date);
date.setDate(date.getDate() + 1);
}
]]>