Merge pull request vuejs#1816 from kazupon/fix/utility

yyx990803 · yyx990803 · commit ffe5825a0d98 · 2015-11-16T10:50:44.000-05:00
fix: ocurred error in 'set' and 'delete' utility functions
diff --git a/src/compiler/compile-props.js b/src/compiler/compile-props.js
@@ -185,7 +185,7 @@ function makePropsLinkFn (props) {
 
 function getDefault (vm, options) {
   // no default, return undefined
-  if (!options.hasOwnProperty('default')) {
+  if (!_.hasOwn(options, 'default')) {
     // absent boolean value defaults to false
     return options.type === Boolean
       ? false
diff --git a/src/directives/internal/class.js b/src/directives/internal/class.js
@@ -67,5 +67,5 @@ function stringToObject (value) {
 function contains (value, key) {
   return _.isArray(value)
     ? value.indexOf(key) > -1
-    : value.hasOwnProperty(key)
+    : _.hasOwn(value, key)
 }
diff --git a/src/directives/public/el.js b/src/directives/public/el.js
@@ -11,7 +11,7 @@ module.exports = {
     }
     var id = this.id = _.camelize(this.arg)
     var refs = (this._scope || this.vm).$els
-    if (refs.hasOwnProperty(id)) {
+    if (_.hasOwn(refs, id)) {
       refs[id] = this.el
     } else {
       _.defineReactive(refs, id, this.el)
diff --git a/src/directives/public/for.js b/src/directives/public/for.js
@@ -87,8 +87,8 @@ module.exports = {
     var item = data[0]
     var convertedFromObject = this.fromObject =
       isObject(item) &&
-      item.hasOwnProperty('$key') &&
-      item.hasOwnProperty('$value')
+      _.hasOwn(item, '$key') &&
+      _.hasOwn(item, '$value')
 
     var trackByKey = this.params.trackBy
     var oldFrags = this.frags
@@ -373,7 +373,7 @@ module.exports = {
       }
     } else {
       id = this.id
-      if (value.hasOwnProperty(id)) {
+      if (_.hasOwn(value, id)) {
         if (value[id] === null) {
           value[id] = frag
         } else {
@@ -430,7 +430,7 @@ module.exports = {
     var index = scope.$index
     // fix #948: avoid accidentally fall through to
     // a parent repeater which happens to have $key.
-    var key = scope.hasOwnProperty('$key') && scope.$key
+    var key = _.hasOwn(scope, '$key') && scope.$key
     var primitive = !isObject(value)
     if (trackByKey || key || primitive) {
       var id = trackByKey
diff --git a/src/instance/state.js b/src/instance/state.js
@@ -54,14 +54,14 @@ exports._initData = function () {
     this._data = optionsData
     for (var prop in propsData) {
       if (process.env.NODE_ENV !== 'production' &&
-          optionsData.hasOwnProperty(prop)) {
+          _.hasOwn(optionsData, prop)) {
         _.warn(
           'Data field "' + prop + '" is already defined ' +
           'as a prop. Use prop default value instead.'
         )
       }
       if (this._props[prop].raw !== null ||
-          !optionsData.hasOwnProperty(prop)) {
+          !_.hasOwn(optionsData, prop)) {
         _.set(optionsData, prop, propsData[prop])
       }
     }
@@ -105,7 +105,7 @@ exports._setData = function (newData) {
   i = keys.length
   while (i--) {
     key = keys[i]
-    if (!this.hasOwnProperty(key)) {
+    if (!_.hasOwn(this, key)) {
       // new property
       this._proxy(key)
     }
diff --git a/src/observer/index.js b/src/observer/index.js
@@ -48,7 +48,7 @@ Observer.create = function (value, vm) {
   }
   var ob
   if (
-    Object.prototype.hasOwnProperty.call(value, '__ob__') &&
+    _.hasOwn(value, '__ob__') &&
     value.__ob__ instanceof Observer
   ) {
     ob = value.__ob__
diff --git a/src/util/lang.js b/src/util/lang.js
@@ -10,7 +10,7 @@
  */
 
 exports.set = function set (obj, key, val) {
-  if (obj.hasOwnProperty(key)) {
+  if (exports.hasOwn(obj, key)) {
     obj[key] = val
     return
   }
@@ -43,7 +43,7 @@ exports.set = function set (obj, key, val) {
  */
 
 exports.delete = function (obj, key) {
-  if (!obj.hasOwnProperty(key)) {
+  if (!exports.hasOwn(obj, key)) {
     return
   }
   delete obj[key]
@@ -62,6 +62,18 @@ exports.delete = function (obj, key) {
   }
 }
 
+var hasOwn = Object.prototype.hasOwnProperty
+/**
+ * Check whether the object has the property.
+ *
+ * @param {Object} obj
+ * @param {String} key
+ * @return {Boolean}
+ */
+exports.hasOwn = function (obj, key) {
+  return hasOwn.call(obj, key)
+}
+
 /**
  * Check if an expression is a literal value.
  *
diff --git a/src/util/options.js b/src/util/options.js
@@ -25,7 +25,7 @@ function mergeData (to, from) {
   for (key in from) {
     toVal = to[key]
     fromVal = from[key]
-    if (!to.hasOwnProperty(key)) {
+    if (!_.hasOwn(to, key)) {
       _.set(to, key, fromVal)
     } else if (_.isObject(toVal) && _.isObject(fromVal)) {
       mergeData(toVal, fromVal)
@@ -326,7 +326,7 @@ exports.mergeOptions = function merge (parent, child, vm) {
     mergeField(key)
   }
   for (key in child) {
-    if (!(parent.hasOwnProperty(key))) {
+    if (!(_.hasOwn(parent, key))) {
       mergeField(key)
     }
   }
diff --git a/test/unit/specs/api/data_spec.js b/test/unit/specs/api/data_spec.js
@@ -57,8 +57,8 @@ describe('Data API', function () {
   it('$delete', function () {
     vm._digest = jasmine.createSpy()
     vm.$delete('a')
-    expect(vm.hasOwnProperty('a')).toBe(false)
-    expect(vm._data.hasOwnProperty('a')).toBe(false)
+    expect(_.hasOwn(vm, 'a')).toBe(false)
+    expect(_.hasOwn(vm._data, 'a')).toBe(false)
     expect(vm._digest).toHaveBeenCalled()
     // reserved key should not be deleted
     vm.$delete('_data')
diff --git a/test/unit/specs/instance/state_spec.js b/test/unit/specs/instance/state_spec.js
@@ -1,4 +1,5 @@
 var Vue = require('../../../../src/vue')
+var _ = require('../../../../src/util')
 
 describe('Instance state initialization', function () {
 
@@ -38,7 +39,7 @@ describe('Instance state initialization', function () {
         el: document.createElement('div'),
         props: ['c']
       })
-      expect(vm.hasOwnProperty('c')).toBe(true)
+      expect(_.hasOwn(vm, 'c')).toBe(true)
     })
 
     it('should use default prop value if prop not provided', function () {
@@ -98,7 +99,7 @@ describe('Instance state initialization', function () {
       // proxy new key
       expect(vm.b).toBe(2)
       // unproxy old key that's no longer present
-      expect(vm.hasOwnProperty('a')).toBe(false)
+      expect(_.hasOwn(vm, 'a')).toBe(false)
     })
   })
 
diff --git a/test/unit/specs/observer/observer_spec.js b/test/unit/specs/observer/observer_spec.js
@@ -282,7 +282,7 @@ describe('Observer', function () {
     expect(obj.b).toBe(2)
     expect(dep.notify.calls.count()).toBe(1)
     _.delete(obj, 'a')
-    expect(obj.hasOwnProperty('a')).toBe(false)
+    expect(_.hasOwn(obj, 'a')).toBe(false)
     expect(dep.notify.calls.count()).toBe(2)
     // set existing key, should be a plain set and not
     // trigger own ob's notify
@@ -299,7 +299,19 @@ describe('Observer', function () {
     // should work on non-observed objects
     var obj2 = { a: 1 }
     _.delete(obj2, 'a')
-    expect(obj2.hasOwnProperty('a')).toBe(false)
+    expect(_.hasOwn(obj2, 'a')).toBe(false)
+    // should work on Object.create(null)
+    var obj3 = Object.create(null)
+    obj3.a = 1
+    var ob3 = Observer.create(obj3)
+    var dep3 = ob3.dep
+    spyOn(dep3, 'notify')
+    _.set(obj3, 'b', 2)
+    expect(obj3.b).toBe(2)
+    expect(dep3.notify.calls.count()).toBe(1)
+    _.delete(obj3, 'a')
+    expect(_.hasOwn(obj3, 'a')).toBe(false)
+    expect(dep3.notify.calls.count()).toBe(2)
   })
 
   it('observing array mutation', function () {
diff --git a/test/unit/specs/parsers/path_spec.js b/test/unit/specs/parsers/path_spec.js
@@ -1,4 +1,5 @@
 var Path = require('../../../../src/parsers/path')
+var _ = require('../../../../src/util')
 
 function assertPath (str, expected) {
   var path = Path.parse(str)
@@ -144,7 +145,7 @@ describe('Path Parser', function () {
     var target = Object.create(parent)
     var res = Path.set(target, 'a.b.c', 123)
     expect(res).toBe(true)
-    expect(target.hasOwnProperty('a')).toBe(false)
+    expect(_.hasOwn(target, 'a')).toBe(false)
     expect(parent.a.b.c).toBe(123)
   })
 
diff --git a/test/unit/specs/util/lang_spec.js b/test/unit/specs/util/lang_spec.js
@@ -2,6 +2,14 @@ var _ = require('../../../../src/util')
 
 describe('Util - Language Enhancement', function () {
 
+  it('hasOwn', function () {
+    var obj1 = { a: 1 }
+    expect(_.hasOwn(obj1, 'a')).toBe(true)
+    var obj2 = Object.create(null)
+    obj2.a = 2
+    expect(_.hasOwn(obj2, 'a')).toBe(true)
+  })
+
   it('isLiteral', function () {
     expect(_.isLiteral('123')).toBe(true)
     expect(_.isLiteral('12.3')).toBe(true)

Original file line number	Diff line number	Diff line change
`@@ -67,5 +67,5 @@ function stringToObject (value) {`
`67`	`67`	`function contains (value, key) {`
`68`	`68`	`return _.isArray(value)`
`69`	`69`	`? value.indexOf(key) > -1`
`70`		`- : value.hasOwnProperty(key)`
	`70`	`+ : _.hasOwn(value, key)`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ module.exports = {`
`11`	`11`	`}`
`12`	`12`	`var id = this.id = _.camelize(this.arg)`
`13`	`13`	`var refs = (this._scope \|\| this.vm).$els`
`14`		`- if (refs.hasOwnProperty(id)) {`
	`14`	`+ if (_.hasOwn(refs, id)) {`
`15`	`15`	`refs[id] = this.el`
`16`	`16`	`} else {`
`17`	`17`	`_.defineReactive(refs, id, this.el)`
Original file line number	Diff line number	Diff line change
`@@ -54,14 +54,14 @@ exports._initData = function () {`
`54`	`54`	`this._data = optionsData`
`55`	`55`	`for (var prop in propsData) {`
`56`	`56`	`if (process.env.NODE_ENV !== 'production' &&`
`57`		`- optionsData.hasOwnProperty(prop)) {`
	`57`	`+ _.hasOwn(optionsData, prop)) {`
`58`	`58`	`_.warn(`
`59`	`59`	`'Data field "' + prop + '" is already defined ' +`
`60`	`60`	`'as a prop. Use prop default value instead.'`
`61`	`61`	`)`
`62`	`62`	`}`
`63`	`63`	`if (this._props[prop].raw !== null \|\|`
`64`		`- !optionsData.hasOwnProperty(prop)) {`
	`64`	`+ !_.hasOwn(optionsData, prop)) {`
`65`	`65`	`_.set(optionsData, prop, propsData[prop])`
`66`	`66`	`}`
`67`	`67`	`}`
`@@ -105,7 +105,7 @@ exports._setData = function (newData) {`
`105`	`105`	`i = keys.length`
`106`	`106`	`while (i--) {`
`107`	`107`	`key = keys[i]`
`108`		`- if (!this.hasOwnProperty(key)) {`
	`108`	`+ if (!_.hasOwn(this, key)) {`
`109`	`109`	`// new property`
`110`	`110`	`this._proxy(key)`
`111`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ Observer.create = function (value, vm) {`
`48`	`48`	`}`
`49`	`49`	`var ob`
`50`	`50`	`if (`
`51`		`- Object.prototype.hasOwnProperty.call(value, '__ob__') &&`
	`51`	`+ _.hasOwn(value, '__ob__') &&`
`52`	`52`	`value.__ob__ instanceof Observer`
`53`	`53`	`) {`
`54`	`54`	`ob = value.__ob__`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ function mergeData (to, from) {`
`25`	`25`	`for (key in from) {`
`26`	`26`	`toVal = to[key]`
`27`	`27`	`fromVal = from[key]`
`28`		`- if (!to.hasOwnProperty(key)) {`
	`28`	`+ if (!_.hasOwn(to, key)) {`
`29`	`29`	`_.set(to, key, fromVal)`
`30`	`30`	`} else if (_.isObject(toVal) && _.isObject(fromVal)) {`
`31`	`31`	`mergeData(toVal, fromVal)`
`@@ -326,7 +326,7 @@ exports.mergeOptions = function merge (parent, child, vm) {`
`326`	`326`	`mergeField(key)`
`327`	`327`	`}`
`328`	`328`	`for (key in child) {`
`329`		`- if (!(parent.hasOwnProperty(key))) {`
	`329`	`+ if (!(_.hasOwn(parent, key))) {`
`330`	`330`	`mergeField(key)`
`331`	`331`	`}`
`332`	`332`	`}`