javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 03:31:45 +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

3
package.json
View File

@ -1,4 +1,7 @@
{
"name": "NativeScript",
"description": "Telerik NativeScript Core Modules",
"homepage": "https://www.nativescript.org",
"repository": {
"type": "git",
"url": "https://github.com/NativeScript/NativeScript"

4
tests/app/ui/button/button-tests.ts
View File

@ -310,7 +310,7 @@ export function test_IntegrationTest_Transform_Decoration_Spacing_WithoutFormatt
TKUnit.assertEqual(view.style.textTransform, enums.TextTransform.uppercase, "TextTransform");
TKUnit.assertEqual(view.style.textDecoration, enums.TextDecoration.underline, "TextDecoration");
TKUnit.assertEqual(view.style.letterSpacing, 10, "LetterSpacing");
TKUnit.assertEqual(view.style.letterSpacing, 1, "LetterSpacing");
});
}
@ -323,6 +323,6 @@ export function test_IntegrationTest_Transform_Decoration_Spacing_WithFormattedT
TKUnit.assertEqual(view.style.textTransform, enums.TextTransform.uppercase, "TextTransform");
TKUnit.assertEqual(view.style.textDecoration, enums.TextDecoration.underline, "TextDecoration");
TKUnit.assertEqual(view.style.letterSpacing, 10, "LetterSpacing");
TKUnit.assertEqual(view.style.letterSpacing, 1, "LetterSpacing");
});
}

4
tests/app/ui/label/label-tests.ts
View File

@ -605,7 +605,7 @@ export function test_IntegrationTest_Transform_Decoration_Spacing_WithoutFormatt
TKUnit.assertEqual(view.style.textTransform, enums.TextTransform.uppercase, "TextTransform");
TKUnit.assertEqual(view.style.textDecoration, enums.TextDecoration.underline, "TextDecoration");
TKUnit.assertEqual(view.style.letterSpacing, 10, "LetterSpacing");
TKUnit.assertEqual(view.style.letterSpacing, 1, "LetterSpacing");
});
}
@ -618,6 +618,6 @@ export function test_IntegrationTest_Transform_Decoration_Spacing_WithFormattedT
TKUnit.assertEqual(view.style.textTransform, enums.TextTransform.uppercase, "TextTransform");
TKUnit.assertEqual(view.style.textDecoration, enums.TextDecoration.underline, "TextDecoration");
TKUnit.assertEqual(view.style.letterSpacing, 10, "LetterSpacing");
TKUnit.assertEqual(view.style.letterSpacing, 1, "LetterSpacing");
});
}

4
tests/app/ui/text-field/text-field-tests.ts
View File

@ -549,7 +549,7 @@ export function test_IntegrationTest_Transform_Decoration_Spacing_WithoutFormatt
TKUnit.assertEqual(view.style.textTransform, enums.TextTransform.uppercase, "TextTransform");
TKUnit.assertEqual(view.style.textDecoration, enums.TextDecoration.underline, "TextDecoration");
TKUnit.assertEqual(view.style.letterSpacing, 10, "LetterSpacing");
TKUnit.assertEqual(view.style.letterSpacing, 1, "LetterSpacing");
});
}
@ -562,6 +562,6 @@ export function test_IntegrationTest_Transform_Decoration_Spacing_WithFormattedT
TKUnit.assertEqual(view.style.textTransform, enums.TextTransform.uppercase, "TextTransform");
TKUnit.assertEqual(view.style.textDecoration, enums.TextDecoration.underline, "TextDecoration");
TKUnit.assertEqual(view.style.letterSpacing, 10, "LetterSpacing");
TKUnit.assertEqual(view.style.letterSpacing, 1, "LetterSpacing");
});
}

4
tests/app/ui/text-view/text-view-tests.ts
View File

@ -503,7 +503,7 @@ export function test_IntegrationTest_Transform_Decoration_Spacing_WithoutFormatt
TKUnit.assertEqual(view.style.textTransform, enums.TextTransform.uppercase, "TextTransform");
TKUnit.assertEqual(view.style.textDecoration, enums.TextDecoration.underline, "TextDecoration");
TKUnit.assertEqual(view.style.letterSpacing, 10, "LetterSpacing");
TKUnit.assertEqual(view.style.letterSpacing, 1, "LetterSpacing");
});
}
@ -516,6 +516,6 @@ export function test_IntegrationTest_Transform_Decoration_Spacing_WithFormattedT
TKUnit.assertEqual(view.style.textTransform, enums.TextTransform.uppercase, "TextTransform");
TKUnit.assertEqual(view.style.textDecoration, enums.TextDecoration.underline, "TextDecoration");
TKUnit.assertEqual(view.style.letterSpacing, 10, "LetterSpacing");
TKUnit.assertEqual(view.style.letterSpacing, 1, "LetterSpacing");
});
}

7
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,7 +33,7 @@ export class Button extends common.Button {
return that.get();
},
onClick: function(v) {
onClick: function (v) {
if (this.owner) {
this.owner._emit(common.Button.tapEvent);
}
@ -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,11 +121,13 @@ export class ButtonStyler implements style.Styler {
TextBaseStyler.setWhiteSpaceProperty,
TextBaseStyler.resetWhiteSpaceProperty), "Button");
if (parseInt(device.sdkVersion, 10) >= 21) {
style.registerHandler(style.letterSpacingProperty, new style.StylePropertyChangedHandler(
TextBaseStyler.setLetterSpacingProperty,
TextBaseStyler.resetLetterSpacingProperty,
TextBaseStyler.getLetterSpacingProperty), "Button");
}
}
}
ButtonStyler.registerHandlers();

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

@ -3,6 +3,7 @@ import utils = require("utils/utils");
import style = require("ui/styling/style");
import font = require("ui/styling/font");
import enums = require("ui/enums");
import {device} from "platform";
export class TextBaseStyler implements style.Styler {
// color
@ -109,21 +110,17 @@ export class TextBaseStyler implements style.Styler {
}
// letter-spacing
private static getLetterSpacingProperty(view: view.View) : any {
return view.android.getLetterSpacing ? view.android.getLetterSpacing() : 0;
private static getLetterSpacingProperty(view: view.View): any {
return view.android.getLetterSpacing();
}
private static setLetterSpacingProperty(view: view.View, newValue: any) {
if(view.android.setLetterSpacing) {
view.android.setLetterSpacing(newValue);
}
}
private static resetLetterSpacingProperty(view: view.View, nativeValue: any) {
if(view.android.setLetterSpacing) {
view.android.setLetterSpacing(nativeValue);
}
}
public static registerHandlers() {
style.registerHandler(style.colorProperty, new style.StylePropertyChangedHandler(
@ -153,10 +150,12 @@ export class TextBaseStyler implements style.Styler {
TextBaseStyler.setWhiteSpaceProperty,
TextBaseStyler.resetWhiteSpaceProperty), "TextBase");
if (parseInt(device.sdkVersion, 10) >= 21) {
style.registerHandler(style.letterSpacingProperty, new style.StylePropertyChangedHandler(
TextBaseStyler.setLetterSpacingProperty,
TextBaseStyler.resetLetterSpacingProperty,
TextBaseStyler.getLetterSpacingProperty), "TextBase");
}
// !!! IMPORTANT !!! Button registrations were moved to button.android.ts to make sure they
// are executed when there is a Button on the page: https://github.com/NativeScript/NativeScript/issues/1902