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 unit-tests checks. (#2538)

Browse Source 
* Fix unit-tests checks.
LetterSpacing handlers are added for iOS and Android API 21+

* Removed unneded check for android

* Used parseInt instead of new Number due to TSLint error
This commit is contained in:
Hristo Hristov
2016-08-01 16:21:32 +03:00
committed by GitHub
parent 9d58707da5
commit 30c998a954
7 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tns-core-modules/ui/button/button.android.ts
View File

@@ -3,6 +3,7 @@ import utils = require("utils/utils")
import dependencyObservable = require("ui/core/dependency-observable");
import style = require("ui/styling/style");
import { TextBaseStyler as TBS } from "ui/text-base/text-base-styler";
import {device} from "platform";
global.moduleMerge(common, exports);
@@ -32,12 +33,12 @@ export class Button extends common.Button {
return that.get();
},
onClick: function(v) {
onClick: function (v) {
if (this.owner) {
this.owner._emit(common.Button.tapEvent);
}
}
}));
}));
this._android.setOnTouchListener(new android.view.View.OnTouchListener(
<utils.Owned & android.view.View.IOnTouchListener>{
@@ -45,7 +46,7 @@ export class Button extends common.Button {
return that.get();
},
onTouch: function(v, ev) {
onTouch: function (v, ev) {
if (ev.getAction() === 0) { // down
this.owner._goToVisualState("highlighted");
}
@@ -120,10 +121,12 @@ export class ButtonStyler implements style.Styler {
TextBaseStyler.setWhiteSpaceProperty,
TextBaseStyler.resetWhiteSpaceProperty), "Button");
style.registerHandler(style.letterSpacingProperty, new style.StylePropertyChangedHandler(
TextBaseStyler.setLetterSpacingProperty,
TextBaseStyler.resetLetterSpacingProperty,
TextBaseStyler.getLetterSpacingProperty), "Button");
if (parseInt(device.sdkVersion, 10) >= 21) {
style.registerHandler(style.letterSpacingProperty, new style.StylePropertyChangedHandler(
TextBaseStyler.setLetterSpacingProperty,
TextBaseStyler.resetLetterSpacingProperty,
TextBaseStyler.getLetterSpacingProperty), "Button");
}
}
}