Merge branch 'map-copy-constructor' into 3.2.8

falkgottlob · Aug 1, 2013 · 4c6b28d · 4c6b28d
2 parents b563495 + 4b839b6
commit 4c6b28d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/d3.js b/d3.js
@@ -204,7 +204,9 @@ d3 = function() {
   }
   d3.map = function(object) {
     var map = new d3_Map();
-    for (var key in object) map.set(key, object[key]);
+    if (object instanceof d3_Map) object.forEach(function(key, value) {
+      map.set(key, value);
+    }); else for (var key in object) map.set(key, object[key]);
     return map;
   };
   function d3_Map() {}

diff --git a/d3.min.js b/d3.min.js
diff --git a/src/arrays/map.js b/src/arrays/map.js
@@ -2,7 +2,8 @@ import "../core/class";
 
 d3.map = function(object) {
   var map = new d3_Map;
-  for (var key in object) map.set(key, object[key]);
+  if (object instanceof d3_Map) object.forEach(function(key, value) { map.set(key, value); });
+  else for (var key in object) map.set(key, object[key]);
   return map;
 };
 

diff --git a/test/arrays/map-test.js b/test/arrays/map-test.js
@@ -41,6 +41,14 @@ suite.addBatch({
         var m = map(Object.create(null, {foo: {value: 42, enumerable: false}}));
         assert.isFalse(m.has("foo"));
         assert.isUndefined(m.get("foo"));
+      },
+      "map(map) copies the given map": function(map) {
+        var a = map({foo: 42}),
+            b = map(a);
+        assert.isTrue(b.has("foo"));
+        assert.equal(b.get("foo"), 42);
+        a.set("bar", true);
+        assert.isFalse(b.has("bar"));
       }
     },
     "forEach": {