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

Update TextBase/Button text property when formattedText changes

Browse Source 
Fixes #1794
This commit is contained in:
Rossen Hristov
2016-03-18 14:17:08 +02:00
parent 7458880f28
commit 6c68423ee9
5 changed files with 99 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ui/button/button-common.ts
View File

@@ -99,7 +99,10 @@ export class Button extends view.View implements definition.Button {
}
private onFormattedTextChanged(eventData: observable.PropertyChangeData) {
this._setFormattedTextPropertyToNative(eventData.value);
var value = <formattedString.FormattedString>eventData.value;
this._setFormattedTextPropertyToNative(value);
this._onPropertyChangedFromNative(Button.textProperty, value.toString());
}
public _onTextPropertyChanged(data: dependencyObservable.PropertyChangeData) {
@@ -111,10 +114,14 @@ export class Button extends view.View implements definition.Button {
}
public _onFormattedTextPropertyChanged(data: dependencyObservable.PropertyChangeData) {
if (data.newValue) {
(<formattedString.FormattedString>data.newValue).parent = this;
var newValue = <formattedString.FormattedString>data.newValue;
if (newValue) {
newValue.parent = this;
}
this._setFormattedTextPropertyToNative(data.newValue);
this._setFormattedTextPropertyToNative(newValue);
var newText = newValue ? newValue.toString() : "";
this._onPropertyChangedFromNative(Button.textProperty, newText);
}
public _addChildFromBuilder(name: string, value: any): void {

15
ui/text-base/text-base-common.ts
View File

@@ -96,7 +96,10 @@ export class TextBase extends view.View implements definition.TextBase, formatte
}
private onFormattedTextChanged(eventData: observable.PropertyChangeData) {
this._setFormattedTextPropertyToNative(eventData.value);
var value = (<formattedString.FormattedString>eventData.value);
this._setFormattedTextPropertyToNative(value);
this._onPropertyChangedFromNative(TextBase.textProperty, value.toString());
}
public _onTextPropertyChanged(data: dependencyObservable.PropertyChangeData) {
@@ -108,10 +111,14 @@ export class TextBase extends view.View implements definition.TextBase, formatte
}
public _onFormattedTextPropertyChanged(data: dependencyObservable.PropertyChangeData) {
if (data.newValue) {
(<formattedString.FormattedString>data.newValue).parent = this;
var newValue = (<formattedString.FormattedString>data.newValue);
if (newValue) {
newValue.parent = this;
}
this._setFormattedTextPropertyToNative(data.newValue);
this._setFormattedTextPropertyToNative(newValue);
var newText = newValue ? newValue.toString() : "";
this._onPropertyChangedFromNative(TextBase.textProperty, newText);
}
public _addChildFromBuilder(name: string, value: any): void {