do not trigger change on NaN->NaN set (fix vuejs#4236)

yyx990803 · yyx990803 · commit c1bf20acb675 · 2016-11-18T11:47:02.000-05:00
diff --git a/src/core/observer/index.js b/src/core/observer/index.js
@@ -162,7 +162,7 @@ export function defineReactive (
     },
     set: function reactiveSetter (newVal) {
       const value = getter ? getter.call(obj) : val
-      if (newVal === value) {
+      if (newVal === value || (newVal !== newVal && value !== value)) {
         return
       }
       if (process.env.NODE_ENV !== 'production' && customSetter) {
diff --git a/test/unit/modules/observer/observer.spec.js b/test/unit/modules/observer/observer.spec.js
@@ -177,7 +177,7 @@ describe('Observer', () => {
   })
 
   it('observing object prop change', () => {
-    const obj = { a: { b: 2 }}
+    const obj = { a: { b: 2 }, c: NaN }
     observe(obj)
     // mock a watcher!
     const watcher = {
@@ -192,20 +192,25 @@ describe('Observer', () => {
     Dep.target = watcher
     obj.a.b
     Dep.target = null
-    expect(watcher.deps.length).toBe(3) // obj.a + a.b + b
+    expect(watcher.deps.length).toBe(3) // obj.a + a + a.b
     obj.a.b = 3
     expect(watcher.update.calls.count()).toBe(1)
     // swap object
     obj.a = { b: 4 }
     expect(watcher.update.calls.count()).toBe(2)
     watcher.deps = []
+
     Dep.target = watcher
     obj.a.b
+    obj.c
     Dep.target = null
-    expect(watcher.deps.length).toBe(3)
+    expect(watcher.deps.length).toBe(4)
     // set on the swapped object
     obj.a.b = 5
     expect(watcher.update.calls.count()).toBe(3)
+    // should not trigger on NaN -> NaN set
+    obj.c = NaN
+    expect(watcher.update.calls.count()).toBe(3)
   })
 
   it('observing object prop change on defined property', () => {

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ export function defineReactive (`
`162`	`162`	`},`
`163`	`163`	`set: function reactiveSetter (newVal) {`
`164`	`164`	`const value = getter ? getter.call(obj) : val`
`165`		`- if (newVal === value) {`
	`165`	`+ if (newVal === value \|\| (newVal !== newVal && value !== value)) {`
`166`	`166`	`return`
`167`	`167`	`}`
`168`	`168`	`if (process.env.NODE_ENV !== 'production' && customSetter) {`