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

Fix text & fromattedText failing tests

Browse Source
This commit is contained in:
Rossen Hristov
2017-01-12 14:12:41 +02:00
parent eede9c2888
commit cc337094e9
6 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tns-core-modules/ui/text-base/text-base.android.ts
View File

@@ -28,6 +28,7 @@ export class TextBase extends TextBaseCommon {
let spannableStringBuilder = createSpannableStringBuilder(value);
const text = (spannableStringBuilder === null || spannableStringBuilder === undefined) ? '' : <any>spannableStringBuilder;
this._nativeView.setText(text);
textProperty.nativeValueChange(this, (value === null || value === undefined) ? '' : value.toString());
if (spannableStringBuilder && this._nativeView instanceof android.widget.Button &&
!(this._nativeView.getTransformationMethod() instanceof TextTransformation)){

4
tns-core-modules/ui/text-base/text-base.ios.ts
View File

@@ -49,9 +49,11 @@ export class TextBase extends TextBaseCommon {
let nativeView = this.nativeView;
if (nativeView instanceof UIButton) {
nativeView.setAttributedTitleForState(mas, UIControlState.Normal);
} else {
}
else {
nativeView.attributedText = mas;
}
textProperty.nativeValueChange(this, (value === null || value === undefined) ? '' : value.toString());
}
//Color