Better comments. Test most-specific first.

d3 · Aug 5, 2012 · b20c823 · b20c823
1 parent ce8852b
commit b20c823
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 28 deletions.
diff --git a/d3.v2.js b/d3.v2.js
@@ -1390,18 +1390,18 @@
   }
   d3_selectionPrototype.attr = function(name, value) {
     if (arguments.length < 2) {
-      if ((value = typeof name) === "object") {
-        for (value in name) this.attr(value, name[value]);
-        return this;
-      }
-      if (value === "function") {
+      if ((value = typeof name) === "function") {
         return this.each(function() {
           var x = name.apply(this, arguments);
           for (value in x) d3_selection_attr(value, x[value]).apply(this, arguments);
         });
       }
-      value = this.node();
-      return (name = d3.ns.qualify(name)).local ? value.getAttributeNS(name.space, name.local) : value.getAttribute(name);
+      if (value === "string") {
+        value = this.node();
+        return (name = d3.ns.qualify(name)).local ? value.getAttributeNS(name.space, name.local) : value.getAttribute(name);
+      }
+      for (value in name) this.attr(value, name[value]);
+      return this;
     }
     return this.each(d3_selection_attr(name, value));
   };