spmjs
diff --git a/‎contrib/cursor/index.js
Lines changed: 16 additions & 5 deletions b/‎contrib/cursor/index.js
Lines changed: 16 additions & 5 deletions
diff --git a/‎dist/immutable.js
Lines changed: 4 additions & 4 deletions b/‎dist/immutable.js
Lines changed: 4 additions & 4 deletions
@@ -15,10 +15,14 @@ var Map = Immutable.Map;
 
 
 function cursorFrom(rootData, keyPath, onChange) {
-  keyPath =
-    arguments.length === 1 ||
-    typeof keyPath === 'function' && (onChange = keyPath) ? [] :
-    Array.isArray(keyPath) ? keyPath : [keyPath];
+  if (arguments.length === 1) {
+    keyPath = [];
+  } else if (typeof keyPath === 'function') {
+    onChange = keyPath;
+    keyPath = [];
+  } else if (!Array.isArray(keyPath)) {
+    keyPath = [keyPath];
+  }
   return makeCursor(rootData, keyPath, onChange);
 }
 
@@ -108,6 +112,9 @@ IndexedCursorPrototype.cursor = function(subKey) {
     this : subCursor(this, subKey);
 }
 
+/**
+ * All iterables need to implement __iterate
+ */
 KeyedCursorPrototype.__iterate =
 IndexedCursorPrototype.__iterate = function(fn, reverse) {
   var deref = this.deref();
@@ -117,10 +124,14 @@ IndexedCursorPrototype.__iterate = function(fn, reverse) {
   ) : 0;
 }
 
+/**
+ * All iterables need to implement __iterator
+ */
 KeyedCursorPrototype.__iterator =
 IndexedCursorPrototype.__iterator = function(type, reverse) {
   var deref = this.deref();
-  var iterator = deref && deref.__iterator && deref.__iterator(Iterator.ENTRIES, reverse);
+  var iterator = deref && deref.__iterator &&
+    deref.__iterator(Iterator.ENTRIES, reverse);
   return new Iterator(function () {
     if (!iterator) {
       return { value: undefined, done: true };
 
@@ -96,6 +96,9 @@ function wrapIndex(iter, index) {
 function returnTrue() {
   return true;
 }
+function isPlainObj(value) {
+  return value && value.constructor === Object;
+}
 function wholeSlice(begin, end, size) {
   return (begin === 0 || (size !== undefined && begin <= -size)) && (end === undefined || (size !== undefined && end >= size));
 }
@@ -1102,9 +1105,6 @@ function seqFromValue(value, maybeSingleton) {
 function isArrayLike(value) {
   return value && typeof value.length === 'number';
 }
-function isPlainObj(value) {
-  return value && value.constructor === Object;
-}
 function seqIterate(seq, fn, reverse, useKeys) {
   assertNotInfinite(seq.size);
   var cache = seq._cache;
@@ -3533,7 +3533,7 @@ function fromJS(json, converter) {
   return _fromJSDefault(json);
 }
 function _fromJSWith(converter, json, key, parentJSON) {
-  if (json && (Array.isArray(json) || json.constructor === Object)) {
+  if (Array.isArray(json) || isPlainObj(json)) {
     return converter.call(parentJSON, key, Iterable(json).map((function(v, k) {
       return _fromJSWith(converter, v, k, json);
     })));