javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed binding converter calls.

Browse Source
This commit is contained in:
Nedyalko Nikolov
2016-06-13 14:24:01 +03:00
parent 9d3df48f97
commit adc8f01cfe
2 changed files with 48 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tns-core-modules/ui/core/bindable.ts
View File

@@ -61,7 +61,7 @@ export class Bindable extends DependencyObservable implements definition.Bindabl
}
// if (!types.isNullOrUndefined(bindingSource)) {
binding.bind(bindingSource);
binding.bind(bindingSource);
// }
}
@@ -119,7 +119,11 @@ export class Bindable extends DependencyObservable implements definition.Bindabl
if (trace.enabled) {
trace.write(`Binding ${binding.target.get()}.${binding.options.targetProperty} to new context ${newValue}`, trace.categories.Binding);
}
binding.bind(newValue);
if (!types.isNullOrUndefined(newValue)) {
binding.bind(newValue);
} else {
binding.clearBinding();
}
}
});
}
@@ -222,16 +226,18 @@ export class Binding {
source = this.sourceAsObject(source);
let sourceValue;
if (!types.isNullOrUndefined(source)) {
this.source = new WeakRef(source);
this.sourceOptions = this.resolveOptions(source, this.sourceProperties);
let sourceValue = this.getSourcePropertyValue();
sourceValue = this.getSourcePropertyValue();
this.updateTarget(sourceValue);
this.addPropertyChangeListeners(this.source, this.sourceProperties);
}
else {
this.updateTarget(source);
} else if (!this.sourceIsBindingContext) {
sourceValue = this.getSourcePropertyValue();
this.updateTarget(sourceValue ? sourceValue : source);
}
}
@@ -489,7 +495,7 @@ export class Binding {
private getSourcePropertyValue() {
if (this.options.expression) {
let changedModel = {};
changedModel[bc.bindingValueKey] = this.source.get();
changedModel[bc.bindingValueKey] = this.source ? this.source.get() : undefined;
let expressionValue = this._getExpressionValue(this.options.expression, false, changedModel);
if (expressionValue instanceof Error) {
trace.write((<Error>expressionValue).message, trace.categories.Binding, trace.messageType.error);
@@ -516,6 +522,11 @@ export class Binding {
return null;
}
public clearBinding() {
this.clearSource();
this.updateTarget(undefined);
}
private updateTarget(value: any) {
if (this.updating) {
return;