Merge 726415d into e8774e5

mobxjs · Jan 31, 2016 · d327864 · d327864
2 parents e8774e5 + 726415d
commit d327864
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/core.ts b/src/core.ts
@@ -566,9 +566,9 @@ export function makeChildObservable(value, parentMode:ValueMode, context) {
 			throw "Illegal State";
 	}
 
-	if (Array.isArray(value))
+	if (Array.isArray(value) && Object.isExtensible(value))
 		return createObservableArray(<[]> value, childMode, true, context);
-	if (isPlainObject(value))
+	if (isPlainObject(value) && Object.isExtensible(value))
 		return extendObservableHelper(value, value, childMode, context);
 	return value;
 }
@@ -628,4 +628,4 @@ export function observe(thing, property?, listener?):Lambda {
     if (isPlainObject(thing))
         return (<any>observable(thing)).$mobservable.observe(listener);
     throw new Error("[mobservable.observe] first argument should be an observable array, observable map, observable object or plain object.");
-}
+}
diff --git a/test/makereactive.js b/test/makereactive.js
@@ -32,6 +32,7 @@ test('isObservable', function(t) {
 
     t.equal(m.isObservable(m.observable([])), true);
     t.equal(m.isObservable(m.observable({})), true);
+    t.equal(m.isObservable(m.observable(Object.freeze({}))), false);
     t.equal(m.isObservable(m.observable(function() {})), true);
 
     t.equal(m.isObservable([]), false);
@@ -469,4 +470,4 @@ test('exceptions', function(t) {
     });
 
     return t.end();
-})
+})