Merge pull request NativeScript#1221 from NativeScript/nnikolov/TwoWayBindingUpdateIssue

Nedyalko Nikolov · Nedyalko Nikolov · commit 670d0e11aa9a · 2015-12-08T17:23:07.000+02:00
Fixed issue with two way binding update.
diff --git a/data/observable/observable.ts b/data/observable/observable.ts
@@ -121,16 +121,17 @@ export class Observable implements definition.Observable {
         return this[name];
     }
 
-    private disableNotifications = false;
+    //private disableNotifications = false;
+    private disableNotifications = {};
 
     public _setCore(data: definition.PropertyChangeData) {
-        this.disableNotifications = true;
+        this.disableNotifications[data.propertyName] = true;
         this[data.propertyName] = data.value;
-        this.disableNotifications = false;
+        delete this.disableNotifications[data.propertyName];
     }
 
     public notify<T extends definition.EventData>(data: T) {
-        if (this.disableNotifications) {
+        if (this.disableNotifications[(<any>data).propertyName]) {
             return;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -121,16 +121,17 @@ export class Observable implements definition.Observable {`
`121`	`121`	`return this[name];`
`122`	`122`	`}`
`123`	`123`
`124`		`- private disableNotifications = false;`
	`124`	`+ //private disableNotifications = false;`
	`125`	`+ private disableNotifications = {};`
`125`	`126`
`126`	`127`	`public _setCore(data: definition.PropertyChangeData) {`
`127`		`- this.disableNotifications = true;`
	`128`	`+ this.disableNotifications[data.propertyName] = true;`
`128`	`129`	`this[data.propertyName] = data.value;`
`129`		`- this.disableNotifications = false;`
	`130`	`+ delete this.disableNotifications[data.propertyName];`
`130`	`131`	`}`
`131`	`132`
`132`	`133`	`public notify<T extends definition.EventData>(data: T) {`
`133`		`- if (this.disableNotifications) {`
	`134`	`+ if (this.disableNotifications[(<any>data).propertyName]) {`
`134`	`135`	`return;`
`135`	`136`	`}`
`136`	`137`