From b2966f1fbdb679b0875b624aafcd34127b35441d Mon Sep 17 00:00:00 2001
From: Joe D <joed@destefano.homelinux.com>
Date: Sun, 11 Oct 2015 09:23:37 -0400
Subject: [PATCH] Refer to current _map, not most recent _map

---
 data/observable/observable.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/data/observable/observable.ts b/data/observable/observable.ts
index 565fc58e7..1dff4db84 100644
--- a/data/observable/observable.ts
+++ b/data/observable/observable.ts
@@ -15,16 +15,15 @@ export class Observable implements definition.Observable {
     constructor(json?: any) {
         if (json) {
             this._map = new Map<string, Object>();
-            var that = this;
 
             var definePropertyFunc = function definePropertyFunc(propertyName) {
                 Object.defineProperty(Observable.prototype, propertyName, {
                     get: function () {
-                        return that._map.get(propertyName);
+                        return this._map.get(propertyName);
                     },
                     set: function (value) {
-                        that._map.set(propertyName, value);
-                        that.notify(that._createPropertyChangeData(propertyName, value));
+                        this._map.set(propertyName, value);
+                        this.notify(this._createPropertyChangeData(propertyName, value));
                     },
                     enumerable: true,
                     configurable: true