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

Merge branch 'master' into feature/css-animations-new

Browse Source
This commit is contained in:
Tsvetan Raikov
2016-03-25 15:39:30 +02:00
parent 073cc94926 fbf9dd5a72
commit 2601a49099
16 changed files with 268 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ui/button/button.android.ts
View File

@@ -26,15 +26,15 @@ export class Button extends common.Button {
this._android.setOnClickListener(new android.view.View.OnClickListener(
<utils.Owned & android.view.View.IOnClickListener>{
get owner() {
return that.get();
},
get owner() {
return that.get();
},
onClick: function (v) {
if (this.owner) {
this.owner._emit(common.Button.tapEvent);
onClick: function(v) {
if (this.owner) {
this.owner._emit(common.Button.tapEvent);
}
}
}
}));
this._android.setOnTouchListener(new android.view.View.OnTouchListener(
@@ -62,9 +62,21 @@ export class Button extends common.Button {
}
}
private _transformationMethod;
public _setFormattedTextPropertyToNative(value) {
var newText = value ? value._formattedText : null;
if (this.android) {
if (newText) {
if (!this._transformationMethod) {
this._transformationMethod = this.android.getTransformationMethod();
}
this.android.setTransformationMethod(null);
} else {
if (this._transformationMethod && !this.android.getTransformationMethod()) {
this.android.setTransformationMethod(this._transformationMethod);
}
}
this.android.setText(newText);
}
}