Fix XML tests on Safari and IE.

frog/corejs.dart

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /**
  * Generates JS helpers for dart:core. This used to be in a file "core.js".
  * Having them in Dart code means we can easily control which are generated.
  */
 // TODO(jmesserly): one idea to make this cleaner: put these as private "native"
 // methods somewhere in a library that we import. This would be rather elegant
@@ skipping 371 matching lines @@
       map[tagNames[j]] = true;
     }
     table.push({tag: tag, tags: tags, map: map});
   }
   $dynamicMetadata = table;
 }
 """;
 
 /** Snippet for `$typeNameOf`. */
 final String _TYPE_NAME_OF_FUNCTION = @"""
-$defProp(Object.prototype, '$typeNameOf', function() {
-  var constructor = this.constructor;
-  if (typeof(constructor) == 'function') {
-    // The constructor isn't null or undefined at this point. Try
-    // to grab hold of its name.
-    var name = constructor.name;
-    // If the name is a non-empty string, we use that as the type
-    // name of this object. On Firefox, we often get 'Object' as
-    // the constructor name even for more specialized objects so
-    // we have to fall through to the toString() based implementation
-    // below in that case.
-    if (name && typeof(name) == 'string' && name != 'Object') return name;
+$defProp(Object.prototype, '$typeNameOf', (function() {
+  function constructorNameWithFallback(obj) {
+    var constructor = obj.constructor;
+    if (typeof(constructor) == 'function') {
+      // The constructor isn't null or undefined at this point. Try
+      // to grab hold of its name.
+      var name = constructor.name;
+      // If the name is a non-empty string, we use that as the type
+      // name of this object. On Firefox, we often get 'Object' as
+      // the constructor name even for more specialized objects so
+      // we have to fall through to the toString() based implementation
+      // below in that case.
+      if (name && typeof(name) == 'string' && name != 'Object') return name;

[sra1, 2012/02/29 01:28:55]

Nit: I'd put typeof first (assuming name && is protecting against empty string)

[nweiz, 2012/02/29 01:54:28]

Done.

+    }
+    var string = Object.prototype.toString.call(obj);
+    return string.substring(8, string.length - 1);
   }
-  var string = Object.prototype.toString.call(this);
-  var name = string.substring(8, string.length - 1);
-  if (name == 'Window') {
-    name = 'DOMWindow';
-  } else if (name == 'Document') {
-    name = 'HTMLDocument';
-  } else if (name == 'XMLDocument') {
-    name = 'Document';
+
+  // If we're not in the browser, we don't have to worry about any compatibility
+  // headaches.
+  if (typeof(navigator) != 'object') {

[sra1, 2012/02/29 01:28:55]

Nit: typeof is an operator and does not need parens.
There are some others here that could lose the parens too.

[nweiz, 2012/02/29 01:54:28]

I believe the style is to use parens with typeof.

+    return function() { return this.constructor.name; };
   }
-  return name;
-});""";
+
+  var userAgent = navigator.userAgent;
+  if (/Chrome/.test(userAgent)) {
+    return function() { return this.constructor.name; };

[sra1, 2012/02/29 01:28:55]

This function occurs twice.
Which makes me think all the 'methods' could be defined as local functions, then
they can be returned compactly.

function chrome_$typeNameOf() { return this.constructor.name; }
function firefox_$typeNameOf() {
...}


if (...) return chrome_$typeNameOf;
if (/Firefox/...) return firefox_$typeNameOf;
if (/MSIE/...) return msie_$typeNameOf;

[nweiz, 2012/02/29 01:54:28]

Done.

+  } else if (/Firefox/.test(userAgent)) {
+    return function() {
+      var name = constructorNameWithFallback(this);
+      if (name == 'Window') return 'DOMWindow';
+      if (name == 'Document') return 'HTMLDocument';
+      if (name == 'XMLDocument') return 'Document';
+      return name;
+    };
+  } else if (/MSIE/.test(userAgent)) {
+    return function() {
+      var name = constructorNameWithFallback(this);
+      if (name == 'Window') return 'DOMWindow';
+      // IE calls both HTML and XML documents 'Document', so we check for the
+      // xmlVersion property, which is the empty string on HTML documents.
+      if (name == 'Document' && this.xmlVersion) return 'Document';
+      if (name == 'Document') return 'HTMLDocument';
+      return name;
+    };
+  } else {
+    return function() { return constructorNameWithFallback(this); };
+  }
+})());""";
 
 /** Snippet for `$inherits`. */
 final String _INHERITS_FUNCTION = @"""
 /** Implements extends for Dart classes on JavaScript prototypes. */
 function $inherits(child, parent) {
   if (child.prototype.__proto__) {
     child.prototype.__proto__ = parent.prototype;
   } else {
     function tmp() {};
     tmp.prototype = parent.prototype;
@@ skipping 131 matching lines @@
       bound.$length = Math.max(0, funcLength - (argsLength - 1));
       return bound;
     } else {
       var bound = function() {
         return func.apply(thisObj, arguments);
       };
       bound.$length = funcLength;
       return bound;
     }
   };""";