warn unobservable objects

yyx990803 · yyx990803 · commit 5705239ab161 · 2015-08-30T09:50:24.000-04:00
diff --git a/src/observer/index.js b/src/observer/index.js
@@ -25,7 +25,7 @@ function Observer (value) {
       : copyAugment
     augment(value, arrayMethods, arrayKeys)
     this.observeArray(value)
-  } else if (_.isPlainObject(value)) {
+  } else {
     this.walk(value)
   }
 }
@@ -52,11 +52,18 @@ Observer.create = function (value, vm) {
   ) {
     ob = value.__ob__
   } else if (
-    _.isObject(value) &&
+    (_.isArray(value) || _.isPlainObject(value)) &&
     !Object.isFrozen(value) &&
     !value._isVue
   ) {
     ob = new Observer(value)
+  } else if (process.env.NODE_ENV !== 'production') {
+    if (_.isObject(value) && !_.isArray(value) && !_.isPlainObject(value)) {
+      _.warn(
+        'Unobservable object found in data: ' +
+        Object.prototype.toString.call(value)
+      )
+    }
   }
   if (ob && vm) {
     ob.addVm(vm)
diff --git a/test/unit/specs/observer/observer_spec.js b/test/unit/specs/observer/observer_spec.js
@@ -5,6 +5,10 @@ var _ = require('../../../../src/util')
 
 describe('Observer', function () {
 
+  beforeEach(function () {
+    spyOn(_, 'warn')
+  })
+
   it('create on non-observables', function () {
     // skip primitive value
     var ob = Observer.create(1)
@@ -193,4 +197,9 @@ describe('Observer', function () {
     config.proto = true
   })
 
+  it('warn unobservable object', function () {
+    Observer.create(window)
+    expect(hasWarned(_, 'Unobservable object found in data')).toBe(true)
+  })
+
 })
