[HtmlUnit] SVN: [14818] trunk/htmlunit/src

[<rb...@us...>]

Revision: 14818
          http://sourceforge.net/p/htmlunit/code/14818
Author:   rbri
Date:     2017-09-09 14:52:38 +0000 (Sat, 09 Sep 2017)
Log Message:
-----------
latest chrome (wip)

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormat.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DefaultDateTimeFormatter.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/GAEDateTimeFormatter.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormatTest.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2017-09-09 14:29:22 UTC (rev 14817)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java	2017-09-09 14:52:38 UTC (rev 14818)
@@ -671,10 +671,6 @@
     @BrowserFeature(FF45)
     JS_CSS_MOZ_CSS_KEYFRAMES_RULE,
 
-    /** {@link DateTimeFormat} uses the Ascii digits for {@code ar-DZ} locale. */
-    @BrowserFeature({FF, IE})
-    JS_DATE_AR_DZ_ASCII_DIGITS,
-
     /** <code>Date.toLocaleDateString()</code> returns a short form (d.M.yyyy). */
     @BrowserFeature({CHROME, FF})
     JS_DATE_LOCALE_DATE_SHORT,

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormat.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormat.java	2017-09-09 14:29:22 UTC (rev 14817)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormat.java	2017-09-09 14:52:38 UTC (rev 14818)
@@ -154,10 +154,6 @@
         CHROME_FORMATS_.put("en-CA", yyyyDash);
         CHROME_FORMATS_.put("en-IE", mmSlash);
         CHROME_FORMATS_.put("en-MT", mmSlash);
-        CHROME_FORMATS_.put("en-SG", mmSlash);
-        CHROME_FORMATS_.put("es-CL", ddSlash);
-        CHROME_FORMATS_.put("es-PA", ddSlash);
-        CHROME_FORMATS_.put("es-PR", ddSlash);
         CHROME_FORMATS_.put("es-US", ddSlash);
         CHROME_FORMATS_.put("fr", ddSlash);
         CHROME_FORMATS_.put("fr-CH", ddDot);

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DefaultDateTimeFormatter.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DefaultDateTimeFormatter.java	2017-09-09 14:29:22 UTC (rev 14817)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DefaultDateTimeFormatter.java	2017-09-09 14:52:38 UTC (rev 14818)
@@ -14,7 +14,6 @@
  */
 package com.gargoylesoftware.htmlunit.javascript.host.intl;
 
-import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_DATE_AR_DZ_ASCII_DIGITS;
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_DATE_WITH_LEFT_TO_RIGHT_MARK;
 
 import java.time.ZoneId;
@@ -42,11 +41,10 @@
     DefaultDateTimeFormatter(final String locale, final BrowserVersion browserVersion, final String pattern) {
         formatter_ = DateTimeFormatter.ofPattern(pattern);
         if (locale.startsWith("ar")
-                && (!browserVersion.hasFeature(JS_DATE_AR_DZ_ASCII_DIGITS)
-                        || (!"ar-DZ".equals(locale)
+                && (!"ar-DZ".equals(locale)
                                 && !"ar-LY".equals(locale)
                                 && !"ar-MA".equals(locale)
-                                && !"ar-TN".equals(locale)))) {
+                                && !"ar-TN".equals(locale))) {
             final DecimalStyle decimalStyle = DecimalStyle.STANDARD.withZeroDigit('\u0660');
             formatter_ = formatter_.withDecimalStyle(decimalStyle);
         }
@@ -63,9 +61,7 @@
                 break;
 
             case "ar-SA":
-                if (browserVersion.hasFeature(JS_DATE_AR_DZ_ASCII_DIGITS)) {
-                    chronology_ = HijrahChronology.INSTANCE;
-                }
+                chronology_ = HijrahChronology.INSTANCE;
                 break;
 
             case "ar-SD":

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/GAEDateTimeFormatter.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/GAEDateTimeFormatter.java	2017-09-09 14:29:22 UTC (rev 14817)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/intl/GAEDateTimeFormatter.java	2017-09-09 14:52:38 UTC (rev 14818)
@@ -14,8 +14,6 @@
  */
 package com.gargoylesoftware.htmlunit.javascript.host.intl;
 
-import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_DATE_AR_DZ_ASCII_DIGITS;
-
 import java.text.DateFormat;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
@@ -39,11 +37,10 @@
     GAEDateTimeFormatter(final String locale, final BrowserVersion browserVersion, final String pattern) {
         format_ = new SimpleDateFormat(pattern);
         if (locale.startsWith("ar")
-                && (!browserVersion.hasFeature(JS_DATE_AR_DZ_ASCII_DIGITS)
-                        || (!"ar-DZ".equals(locale)
-                                && !"ar-LY".equals(locale)
-                                && !"ar-MA".equals(locale)
-                                && !"ar-TN".equals(locale)))) {
+                && (!"ar-DZ".equals(locale)
+                        && !"ar-LY".equals(locale)
+                        && !"ar-MA".equals(locale)
+                        && !"ar-TN".equals(locale))) {
             setZeroDigit('\u0660');
         }
     }

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormatTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormatTest.java	2017-09-09 14:29:22 UTC (rev 14817)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/intl/DateTimeFormatTest.java	2017-09-09 14:52:38 UTC (rev 14818)
@@ -421,6 +421,7 @@
     @Test
     @Alerts(DEFAULT = "\u0667\u200F/\u0662\u200F/\u0661\u0664\u0663\u0664 \u0647\u0640",
             IE = "\u200F\u0660\u0667\u200F/\u200F\u0660\u0662\u200F/\u200F\u0661\u0664\u0663\u0664")
+    @NotYetImplemented(CHROME)
     public void format_ar_sa() throws Exception {
         test("new Intl.DateTimeFormat('ar-SA').format(date)");
     }