Consider a prototype-free object a map. Fixes immutable-js#302

leebyron · leebyron · commit 923a41e0cd1c · 2015-01-30T22:13:17.000-05:00
diff --git a/__tests__/Conversion.ts b/__tests__/Conversion.ts
@@ -45,6 +45,7 @@ describe('Conversion', () => {
       a: "A",
       b: "B"
     },
+    emptyMap: Object.create(null),
     point: {x: 10, y: 20},
     string: "Hello",
     list: [1, 2, 3]
@@ -68,6 +69,7 @@ describe('Conversion', () => {
       a: "A",
       b: "B"
     }),
+    emptyMap: Map(),
     point: Map({x: 10, y: 20}),
     string: "Hello",
     list: List.of(1, 2, 3)
@@ -89,6 +91,7 @@ describe('Conversion', () => {
       a: "A",
       b: "B"
     }),
+    emptyMap: OrderedMap(),
     point: new Point({x: 10, y: 20}),
     string: "Hello",
     list: List.of(1, 2, 3)
@@ -110,6 +113,7 @@ describe('Conversion', () => {
       'a: "A", '+
       'b: "B"'+
     ' }, '+
+    'emptyMap: OrderedMap {}, ' +
     'point: Point { x: 10, y: 20 }, '+
     'string: "Hello", '+
     'list: List [ 1, 2, 3 ]'+
diff --git a/dist/immutable.js b/dist/immutable.js
@@ -724,7 +724,7 @@
   }
 
   function isPlainObj(value) {
-    return value && value.constructor === Object;
+    return value && (value.constructor === Object || value.constructor === undefined);
   }
 
   var Math__imul =
diff --git a/dist/immutable.min.js b/dist/immutable.min.js
diff --git a/src/fromJS.js b/src/fromJS.js
@@ -36,5 +36,5 @@ function fromJSDefault(json) {
 }
 
 function isPlainObj(value) {
-  return value && value.constructor === Object;
+  return value && (value.constructor === Object || value.constructor === undefined);
 }

Original file line number	Diff line number	Diff line change
`@@ -724,7 +724,7 @@`
`724`	`724`	`}`
`725`	`725`
`726`	`726`	`function isPlainObj(value) {`
`727`		`- return value && value.constructor === Object;`
	`727`	`+ return value && (value.constructor === Object \|\| value.constructor === undefined);`
`728`	`728`	`}`
`729`	`729`
`730`	`730`	`var Math__imul =`
Original file line number	Diff line number	Diff line change
`@@ -36,5 +36,5 @@ function fromJSDefault(json) {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`function isPlainObj(value) {`
`39`		`- return value && value.constructor === Object;`
	`39`	`+ return value && (value.constructor === Object \|\| value.constructor === undefined);`
`40`	`40`	`}`