Changeset 115783 in webkit

Timestamp:

May 1, 2012 8:01:29 PM (12 years ago)

Author:

tkent@chromium.org

Message:

Calendar Picker: Too wide in Japanese locale
​https://bugs.webkit.org/show_bug.cgi?id=85331

Reviewed by Kentaro Hara.

No new tests. This is a locale-specific behavior.

• Resources/calendarPicker.js:

(formatJapaneseImperialEra):
Do not show an imperial era later than 平成99年 to avoid very long
year string like "275760年(平成273772年)."
(YearMonthController.prototype.attachTo):

• Respect the maximum year specfied by <input max=...> If <input max="9999-12-31"> is specified, we don't need to secure space for the year 275,760.
• Check the width for 平成99年 as well as the maximum year because "2087年(平成99年)" is usually wider than "275760年".

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Resources/calendarPicker.js (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-01  Kent Tamura  <tkent@chromium.org>
+
+        Calendar Picker: Too wide in Japanese locale
+        https://bugs.webkit.org/show_bug.cgi?id=85331
+
+        Reviewed by Kentaro Hara.
+
+        No new tests. This is a locale-specific behavior.
+
+        * Resources/calendarPicker.js:
+        (formatJapaneseImperialEra):
+        Do not show an imperial era later than 平成99年 to avoid very long
+        year string like "275760年(平成273772年)."
+        (YearMonthController.prototype.attachTo):
+        - Respect the maximum year specfied by <input max=...>
+          If <input max="9999-12-31"> is specified, we don't need to
+          secure space for the year 275,760.
+        - Check the width for 平成99年 as well as the maximum year because
+          "2087年(平成99年)" is usually wider than "275760年".
+
 2012-05-01  Noel Gordon  <noel.gordon@gmail.com>
 

trunk/Source/WebCore/Resources/calendarPicker.js

@@ -123 +123 @@
 }
 
+/*
+ * @const
+ * @type {number}
+ */
+var ImperialEraLimit = 2087;
+
 /**
  * @param {!number} year
@@ -129 +135 @@
  */
 function formatJapaneseImperialEra(year, month) {
+    // We don't show an imperial era if it is greater than 99 becase of space
+    // limitation.
+    if (year > ImperialEraLimit)
+        return "";
     if (year > 1989)
         return "(平成" + (year - 1988) + "年)";
@@ -427 +437 @@
     main.appendChild(this._wall);
 
-    // The maximum year which <input type=date> supports is 275,760.
-    // See WebCore/platform/DateComponents.h
-    var MaximumYear = 275760;
+    var maximumYear = global.maximumDate.getUTCFullYear();
     var maxWidth = 0;
     for (var m = 0; m < 12; ++m) {
-        this._month.textContent = formatYearMonth(MaximumYear, m);
+        this._month.textContent = formatYearMonth(maximumYear, m);
         maxWidth = Math.max(maxWidth, this._month.offsetWidth);
+    }
+    if (getLanguage() == "ja" && ImperialEraLimit < maximumYear) {
+        for (var m = 0; m < 12; ++m) {
+            this._month.textContent = formatYearMonth(ImperialEraLimit, m);
+            maxWidth = Math.max(maxWidth, this._month.offsetWidth);
+        }
     }
     this._month.style.minWidth = maxWidth + 'px';