Merge pull request NativeScript#150 from NativeScript/nnikolov/BindingWithSourceIssue

Nedyalko Nikolov · Nedyalko Nikolov · commit b3f386f11f54 · 2015-05-12T17:16:31.000+03:00
Fixed issue when UI element is bound to source different from binding&hellip;
diff --git a/apps/tests/ui/bindable-tests.ts b/apps/tests/ui/bindable-tests.ts
@@ -490,4 +490,26 @@ export var test_BindingContext_NavigatingForwardAndBack = function () {
     }
 
     helper.navigateToModuleAndRunTest("./tests/ui/bindingContext_testPage1", null, testFunc);
+}
+
+export var test_BindingToSource_FailsAfterBindingContextChange = function () {
+    var createLabel = function () {
+        var label = new labelModule.Label();
+        return label;
+    }
+    var labelViewModel = new observable.Observable();
+    var expectedValue = "testValue";
+    labelViewModel.set("testProperty", expectedValue);
+
+    var testFunc = function (views: Array<viewModule.View>) {
+        var testLabel = <labelModule.Label>(views[0]);
+        testLabel.bind({ sourceProperty: "testProperty", targetProperty: "text" }, labelViewModel);
+
+        var page = <pageModule.Page>(views[1]);
+        page.bindingContext = new observable.Observable;
+
+        TKUnit.assertEqual(testLabel.text, expectedValue);
+    }
+
+    helper.buildUIAndRunTest(createLabel(), testFunc);
 }
diff --git a/ui/core/bindable.ts b/ui/core/bindable.ts
@@ -102,7 +102,8 @@ export class Bindable extends dependencyObservable.DependencyObservable implemen
         for (var p in this._bindings) {
             binding = this._bindings[p];
 
-            if (binding.updating) {
+            var sourceIsNotBindingContext = (binding.source && (binding.source.get() !== oldValue));
+            if (binding.updating || sourceIsNotBindingContext) {
                 continue;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,8 @@ export class Bindable extends dependencyObservable.DependencyObservable implemen`
`102`	`102`	`for (var p in this._bindings) {`
`103`	`103`	`binding = this._bindings[p];`
`104`	`104`
`105`		`- if (binding.updating) {`
	`105`	`+ var sourceIsNotBindingContext = (binding.source && (binding.source.get() !== oldValue));`
	`106`	`+ if (binding.updating \|\| sourceIsNotBindingContext) {`
`106`	`107`	`continue;`
`107`	`108`	`}`
`108`	`109`