More review fixes

Author: Daniel Herzog

src/client-en.xml

@@ -220,6 +220,7 @@ window.load_screen_timeout = window.setTimeout(function()
 <script src="./lib/nodelistprototype.js"/>
 <script src="./lib/objectnamespace.js"/>
 <script src="./lib/operanamespace.js"/>
+<script src="./lib/datenamespace.js"/>
 <script src="./lib/stringprototype.js"/>
 <script src="./lib/stylesheetlistprototype.js"/>
 <script src="./lib/xmlhttprequestprototype.js"/>

src/cookie-manager/cookie_manager_views.js

@@ -430,21 +430,13 @@ cls.CookieManager.CookieManagerViewBase = function()
       // "domain" is val of [input] (with add_cookie service present), or runtimes .hostname
       var domain       = domain_input && domain_input.value.trim() || runtime && this.data._rts[runtime].hostname;
 
-      // Check if the value retrieved from datetime-local looks local (without trailing Z or +01:00)
-      var expires_is_local = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}(:\d{2}(\.\d+)?)?$/.test(expires);
-
       // Remove "0" milliseconds to make sure Date can parse the string (see CORE-47780).
       // Milliseconds are always 0 for cookies.
       // This make sense even if we got a UTC value or a value with timezone-offset.
-      expires = expires.replace(/\.0+/,"");
+      expires = expires.replace(/\.0+/, "");
 
-      if (expires_is_local)
-        expires = Date.fromLocaleISOString(expires).getTime();
-      else if (expires)
-        expires = new Date(expires).getTime();
-      // If the value retrieved from datetime-local is "", the cookie expires when the session ends.
-      else
-        expires = 0;
+      // Attempt to treat this as localeISOString first.
+      expires = Date.fromLocaleISOString(expires) || Date.parse(expires) || 0;
 
       var object_id = edit_tr.getAttribute("data-object-id");
       var old_cookie;

src/lib/datenamespace.js

@@ -0,0 +1,24 @@
+/**
+ * Local ISO strings, currently needed as datetime-local input values
+ * http://dev.w3.org/html5/markup/input.datetime-local.html#input.datetime-local.attrs.value
+ */
+Date.fromLocaleISOString = function(localeISOString)
+{
+  var is_local = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}(:\d{2}(\.\d+)?)?$/.test(localeISOString);
+  if (!is_local)
+    return NaN;
+
+  var date = new Date(localeISOString);
+
+  // Test if Date parsed the value as a UTC string.
+  // If it does, add the current timezone offset to get the local time.
+  // When the current timezone offset is 0, this will be a false positive,
+  // but that doesn't matter since we correct the value by 0 then.
+  var milliseconds = date.getTime();
+  if (milliseconds === new Date(localeISOString + "Z").getTime())
+  {
+    var timezone_offset = date.getTimezoneOffset() * 1000 * 60;
+    milliseconds += timezone_offset;
+  }
+  return milliseconds;
+};

tests/locale_iso_strings.html

@@ -4,7 +4,8 @@
     <title>Dragonfly - Locale ISO strings</title>
     <link rel="stylesheet" href="qunit/qunit.css" media="screen">
     <script src="qunit/qunit.js"></script>
-    <script src="../src/scripts/dom.js"></script>
+    <script src="../src/lib/dateprototype.js"></script>
+    <script src="../src/lib/datenamespace.js"></script>
 
 
 <script>
@@ -25,8 +26,11 @@
 
   // The outcome of toLocaleISOString depends on the timezone.
   // The expected moment needs to be adjusted.
-  var t = Date.fromLocaleISOString("2012-08-03T17:00").getTime();
-  equal(t, 1344013200000 + TIMEZONE_OFFSET);
+  var ms = Date.fromLocaleISOString("2012-08-03T17:00");
+  equal(ms, 1344013200000 + TIMEZONE_OFFSET);
+
+  var ms = Date.fromLocaleISOString("2012-08-03T17:00+02:00");
+  equal(isNaN(ms), true);
 });