javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-18 22:01:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: refactor per comments

Browse Source
This commit is contained in:
Martin Guillon
2021-01-05 15:50:35 +01:00
parent 79537d9c0c
commit 36a7ce3d9b
3 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/core/ui/core/bindable/index.ts
View File

@ -344,7 +344,8 @@ export class Binding {
} }
let newValue = value; let newValue = value;
if (!__UI_CUSTOM_FLAVOR__ && this.options.expression) { if (__UI_CUSTOM_FLAVOR__) {
} else if (this.options.expression) {
const changedModel = {}; const changedModel = {};
changedModel[bc.bindingValueKey] = value; changedModel[bc.bindingValueKey] = value;
changedModel[bc.newPropertyValueKey] = value; changedModel[bc.newPropertyValueKey] = value;
@ -369,6 +370,7 @@ export class Binding {
newValue = expressionValue; newValue = expressionValue;
} }
this.updateSource(newValue); this.updateSource(newValue);
} }
@ -424,14 +426,7 @@ export class Binding {
} }
} }
if (!__UI_CUSTOM_FLAVOR__ && this.options.expression) { if (__UI_CUSTOM_FLAVOR__ || !this.options.expression) {
const expressionValue = this._getExpressionValue(this.options.expression, false, undefined);
if (expressionValue instanceof Error) {
Trace.write(expressionValue.message, Trace.categories.Binding, Trace.messageType.error);
} else {
this.updateTarget(expressionValue);
}
} else {
if (changedPropertyIndex > -1) { if (changedPropertyIndex > -1) {
const props = sourceProps.slice(changedPropertyIndex + 1); const props = sourceProps.slice(changedPropertyIndex + 1);
const propsLength = props.length; const propsLength = props.length;
@ -446,6 +441,13 @@ export class Binding {
this.updateTarget(data.value); this.updateTarget(data.value);
} }
} }
} else {
const expressionValue = this._getExpressionValue(this.options.expression, false, undefined);
if (expressionValue instanceof Error) {
Trace.write(expressionValue.message, Trace.categories.Binding, Trace.messageType.error);
} else {
this.updateTarget(expressionValue);
}
} }
// we need to do this only if nested objects are used as source and some middle object has changed. // we need to do this only if nested objects are used as source and some middle object has changed.
@ -519,7 +521,8 @@ export class Binding {
} }
private getSourcePropertyValue() { private getSourcePropertyValue() {
if (!__UI_CUSTOM_FLAVOR__ && this.options.expression) { if (__UI_CUSTOM_FLAVOR__) {
} else if (this.options.expression) {
const changedModel = {}; const changedModel = {};
changedModel[bc.bindingValueKey] = this.source ? this.source.get() : undefined; changedModel[bc.bindingValueKey] = this.source ? this.source.get() : undefined;
const expressionValue = this._getExpressionValue(this.options.expression, false, changedModel); const expressionValue = this._getExpressionValue(this.options.expression, false, changedModel);

3
packages/core/ui/list-view/list-view-common.ts
View File

@ -26,7 +26,8 @@ export abstract class ListViewBase extends ContainerView implements ListViewDefi
public _defaultTemplate: KeyedTemplate = { public _defaultTemplate: KeyedTemplate = {
key: 'default', key: 'default',
createView: () => { createView: () => {
if (!__UI_CUSTOM_FLAVOR__ && this.itemTemplate) { if (__UI_CUSTOM_FLAVOR__) {
} else if (this.itemTemplate) {
return Builder.parse(this.itemTemplate, this); return Builder.parse(this.itemTemplate, this);
} }

6
packages/core/ui/repeater/index.ts
View File

@ -129,7 +129,11 @@ export class Repeater extends CustomLayoutView {
} }
if (!viewToAdd) { if (!viewToAdd) {
viewToAdd = (!__UI_CUSTOM_FLAVOR__ && this.itemTemplate) ? Builder.parse(this.itemTemplate, this) : this._getDefaultItemContent(i); if (__UI_CUSTOM_FLAVOR__) {
viewToAdd = this._getDefaultItemContent(i)
} else {
viewToAdd = this.itemTemplate ? Builder.parse(this.itemTemplate, this) : this._getDefaultItemContent(i);
}
} }
viewToAdd.bindingContext = dataItem; viewToAdd.bindingContext = dataItem;