Merge pull request #14571 from emberjs/fix-non-object

[BUGFIX beta] Fix non object paths
emberjs · Nov 2, 2016 · 3c9c494 · 3c9c494
2 parents f359046 + 944e4a7
commit 3c9c494
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/packages/ember-metal/lib/chains.js b/packages/ember-metal/lib/chains.js
@@ -166,7 +166,7 @@ function ChainNode(parent, key, value) {
 }
 
 function lazyGet(obj, key) {
-  if (!obj) {
+  if (!isObject(obj)) {
     return;
   }
 

diff --git a/packages/ember-metal/lib/watch_key.js b/packages/ember-metal/lib/watch_key.js
@@ -12,6 +12,9 @@ import {
 let handleMandatorySetter;
 
 export function watchKey(obj, keyName, meta) {
+  if (typeof obj !== 'object' || obj === null) {
+    return;
+  }
   let m = meta || metaFor(obj);
 
   // activate watching first time
@@ -86,6 +89,9 @@ if (isEnabled('mandatory-setter')) {
 import { UNDEFINED } from './meta';
 
 export function unwatchKey(obj, keyName, _meta) {
+  if (typeof obj !== 'object' || obj === null) {
+    return;
+  }
   let meta = _meta || metaFor(obj);
 
   // do nothing of this object has already been destroyed

diff --git a/packages/ember-metal/lib/watch_path.js b/packages/ember-metal/lib/watch_path.js
@@ -15,6 +15,9 @@ export function makeChainNode(obj) {
 }
 
 export function watchPath(obj, keyPath, meta) {
+  if (typeof obj !== 'object' || obj === null) {
+    return;
+  }
   let m = meta || metaFor(obj);
   let counter = m.peekWatching(keyPath) || 0;
   if (!counter) { // activate watching first time
@@ -26,6 +29,9 @@ export function watchPath(obj, keyPath, meta) {
 }
 
 export function unwatchPath(obj, keyPath, meta) {
+  if (typeof obj !== 'object' || obj === null) {
+    return;
+  }
   let m = meta || metaFor(obj);
   let counter = m.peekWatching(keyPath) || 0;
 

diff --git a/packages/ember-metal/lib/watching.js b/packages/ember-metal/lib/watching.js
@@ -42,6 +42,9 @@ function watch(obj, _keyPath, m) {
 export { watch };
 
 export function isWatching(obj, key) {
+  if (typeof obj !== 'object' || obj === null) {
+    return false;
+  }
   let meta = peekMeta(obj);
   return (meta && meta.peekWatching(key)) > 0;
 }