Made metagetter only call underlying get functions once, switched to included bind function

jdavidberger · jdavidberger · commit 9e11b6208218 · 2015-11-09T18:09:10.000-07:00
diff --git a/src/observer/index.js b/src/observer/index.js
@@ -182,8 +182,8 @@ function defineReactive (obj, key, val) {
     var property = Object.getOwnPropertyDescriptor(obj, key)
     if (property && property.get && property.set) {
       Object.defineProperty(target, 'val', {
-        get: property.get.bind(obj),
-        set: property.set.bind(obj)
+        get: _.bind(property.get, obj),
+        set: _.bind(property.set, obj)
       })
     }
   }
@@ -193,14 +193,15 @@ function defineReactive (obj, key, val) {
     enumerable: true,
     configurable: true,
     get: function metaGetter () {
+      var val = target.val
       if (Dep.target) {
         dep.depend()
         if (childOb) {
           childOb.dep.depend()
         }
-        if (_.isArray(target.val)) {
-          for (var e, i = 0, l = target.val.length; i < l; i++) {
-            e = target.val[i]
+        if (_.isArray(val)) {
+          for (var e, i = 0, l = val.length; i < l; i++) {
+            e = val[i]
             e && e.__ob__ && e.__ob__.dep.depend()
           }
         }
diff --git a/test/unit/lib/util.js b/test/unit/lib/util.js
@@ -2,15 +2,6 @@ var scope = typeof window === 'undefined'
   ? global
   : window
 
-// Some versions of phantomjs doesn't have bind defined. 
-// See https://github.com/ariya/phantomjs/issues/10522
-Function.prototype.bind = Function.prototype.bind || function (thisp) {
-  var fn = this;
-  return function () {
-    return fn.apply(thisp, arguments);
-  };
-};
-
 scope.hasWarned = function (_, msg, silent) {
   var count = _.warn.calls.count()
   while (count--) {

Original file line number	Diff line number	Diff line change
`@@ -182,8 +182,8 @@ function defineReactive (obj, key, val) {`
`182`	`182`	`var property = Object.getOwnPropertyDescriptor(obj, key)`
`183`	`183`	`if (property && property.get && property.set) {`
`184`	`184`	`Object.defineProperty(target, 'val', {`
`185`		`- get: property.get.bind(obj),`
`186`		`- set: property.set.bind(obj)`
	`185`	`+ get: _.bind(property.get, obj),`
	`186`	`+ set: _.bind(property.set, obj)`
`187`	`187`	`})`
`188`	`188`	`}`
`189`	`189`	`}`
`@@ -193,14 +193,15 @@ function defineReactive (obj, key, val) {`
`193`	`193`	`enumerable: true,`
`194`	`194`	`configurable: true,`
`195`	`195`	`get: function metaGetter () {`
	`196`	`+ var val = target.val`
`196`	`197`	`if (Dep.target) {`
`197`	`198`	`dep.depend()`
`198`	`199`	`if (childOb) {`
`199`	`200`	`childOb.dep.depend()`
`200`	`201`	`}`
`201`		`- if (_.isArray(target.val)) {`
`202`		`- for (var e, i = 0, l = target.val.length; i < l; i++) {`
`203`		`- e = target.val[i]`
	`202`	`+ if (_.isArray(val)) {`
	`203`	`+ for (var e, i = 0, l = val.length; i < l; i++) {`
	`204`	`+ e = val[i]`
`204`	`205`	`e && e.__ob__ && e.__ob__.dep.depend()`
`205`	`206`	`}`
`206`	`207`	`}`