javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 04:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Tslint fixes

Browse Source
This commit is contained in:
vakrilov
2017-05-13 14:04:39 +03:00
parent 75ce15bffc
commit e266269793
2 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
apps/app/ui-tests-app/font/all-fonts.ts
View File

@ -14,8 +14,8 @@ const genericFontFamilies = [
"serif", "serif",
"monospace", "monospace",
]; ];
var fontFamilies = []; let fontFamilies = [];
var fontNames = []; let fontNames = [];
const embeddedFontNames = [ const embeddedFontNames = [
"FontAwesome", "FontAwesome",
"Pacifico", "Pacifico",
@ -37,21 +37,21 @@ const fontWeights = [
FontWeight.black, FontWeight.black,
]; ];
var green = new Color("Green"); let green = new Color("Green");
var red = new Color("Red"); let red = new Color("Red");
var white = new Color("White"); let white = new Color("White");
var black = new Color("Black"); let black = new Color("Black");
var compareIgnoreCase = function (a, b) { let compareIgnoreCase = function (a, b) {
return a.toLowerCase().localeCompare(b.toLowerCase()); return a.toLowerCase().localeCompare(b.toLowerCase());
}; };
if (font.ios) { if (font.ios) {
// for (var f = 0; f < embeddedFontNames.length; f++) { // for (let f = 0; f < embeddedFontNames.length; f++) {
// font.ios.registerFont(`fonts/${embeddedFontNames[f]}.ttf`); // font.ios.registerFont(`fonts/${embeddedFontNames[f]}.ttf`);
// } // }
var font_internal = <any>font; let font_internal = <any>font;
font_internal.ensureSystemFontSets(); font_internal.ensureSystemFontSets();
(<Set<string>>font_internal.systemFontFamilies).forEach(f => fontFamilies.push(f)); (<Set<string>>font_internal.systemFontFamilies).forEach(f => fontFamilies.push(f));
@ -62,9 +62,9 @@ if (font.ios) {
} }
export function onPageLoaded(args: NavigatedData) { export function onPageLoaded(args: NavigatedData) {
var page = <Page>args.object; let page = <Page>args.object;
var scrollView = new ScrollView(); let scrollView = new ScrollView();
var stackLayout = new StackLayout(); let stackLayout = new StackLayout();
generateLabels(stackLayout); generateLabels(stackLayout);
scrollView.content = stackLayout; scrollView.content = stackLayout;
page.content = scrollView; page.content = scrollView;
@ -72,11 +72,11 @@ export function onPageLoaded(args: NavigatedData) {
function generateLabels(layout: StackLayout) { function generateLabels(layout: StackLayout) {
layout.addChild(prepareTitle("Generic Font Families", 24)); layout.addChild(prepareTitle("Generic Font Families", 24));
for (var f = 0; f < genericFontFamilies.length; f++) { for (let f = 0; f < genericFontFamilies.length; f++) {
layout.addChild(prepareTitle(genericFontFamilies[f], 20)); layout.addChild(prepareTitle(genericFontFamilies[f], 20));
for (var s = 0; s < fontStyles.length; s++) { for (let s = 0; s < fontStyles.length; s++) {
for (var w = 0; w < fontWeights.length; w++) { for (let w = 0; w < fontWeights.length; w++) {
var view = prepareLabel(genericFontFamilies[f], fontStyles[s], fontWeights[w]); let view = prepareLabel(genericFontFamilies[f], fontStyles[s], fontWeights[w]);
layout.addChild(view); layout.addChild(view);
} }
} }
@ -86,11 +86,11 @@ function generateLabels(layout: StackLayout) {
{ {
layout.addChild(prepareTitle("Font Families", 24)); layout.addChild(prepareTitle("Font Families", 24));
} }
for (var f = 0; f < fontFamilies.length; f++) { for (let f = 0; f < fontFamilies.length; f++) {
layout.addChild(prepareTitle(fontFamilies[f], 20)); layout.addChild(prepareTitle(fontFamilies[f], 20));
for (var s = 0; s < fontStyles.length; s++) { for (let s = 0; s < fontStyles.length; s++) {
for (var w = 0; w < fontWeights.length; w++) { for (let w = 0; w < fontWeights.length; w++) {
var view = prepareLabel(fontFamilies[f], fontStyles[s], fontWeights[w]); let view = prepareLabel(fontFamilies[f], fontStyles[s], fontWeights[w]);
layout.addChild(view); layout.addChild(view);
} }
} }
@ -99,22 +99,22 @@ function generateLabels(layout: StackLayout) {
if (fontNames.length > 0) { if (fontNames.length > 0) {
layout.addChild(prepareTitle("Phone Fonts", 24)); layout.addChild(prepareTitle("Phone Fonts", 24));
} }
for (var f = 0; f < fontNames.length; f++) { for (let f = 0; f < fontNames.length; f++) {
var view = prepareLabel(fontNames[f], "normal", "normal"); let view = prepareLabel(fontNames[f], "normal", "normal");
layout.addChild(view); layout.addChild(view);
} }
if (embeddedFontNames.length > 0) { if (embeddedFontNames.length > 0) {
layout.addChild(prepareTitle("Embedded Fonts", 24)); layout.addChild(prepareTitle("Embedded Fonts", 24));
} }
for (var f = 0; f < embeddedFontNames.length; f++) { for (let f = 0; f < embeddedFontNames.length; f++) {
var view = prepareLabel(embeddedFontNames[f], "normal", "normal"); let view = prepareLabel(embeddedFontNames[f], "normal", "normal");
layout.addChild(view); layout.addChild(view);
} }
} }
function prepareTitle(text: string, fontSize: number) { function prepareTitle(text: string, fontSize: number) {
var title = new Label(); let title = new Label();
title.text = text; title.text = text;
title.height = 100; title.height = 100;
title.backgroundColor = black; title.backgroundColor = black;
@ -128,12 +128,12 @@ function prepareTitle(text: string, fontSize: number) {
} }
function prepareLabel(fontFamily: string, fontStyle: string, fontWeight: string): View { function prepareLabel(fontFamily: string, fontStyle: string, fontWeight: string): View {
var label = new Label(); let label = new Label();
label["font-family"] = fontFamily; label["font-family"] = fontFamily;
var fontFamilyCss = `font-family: ${fontFamily}; `; let fontFamilyCss = `font-family: ${fontFamily}; `;
var fontStyleCss = fontStyle !== FontStyle.normal ? `font-style: ${fontStyle}; ` : ""; let fontStyleCss = fontStyle !== FontStyle.normal ? `font-style: ${fontStyle}; ` : "";
var fontWeightCss = fontWeight !== FontWeight.normal ? `font-weight: ${fontWeight}; ` : ""; let fontWeightCss = fontWeight !== FontWeight.normal ? `font-weight: ${fontWeight}; ` : "";
var css = `${fontFamilyCss}${fontStyleCss}${fontWeightCss}`; let css = `${fontFamilyCss}${fontStyleCss}${fontWeightCss}`;
label.text = `${typeUtils.getClass(label) } {${css}};`; label.text = `${typeUtils.getClass(label) } {${css}};`;
label.textWrap = true; label.textWrap = true;
label.style.textAlignment = "left"; label.style.textAlignment = "left";
@ -142,9 +142,9 @@ function prepareLabel(fontFamily: string, fontStyle: string, fontWeight: string)
label.style.padding = "2"; label.style.padding = "2";
label.setInlineStyle(css); label.setInlineStyle(css);
label.on("loaded", args => { label.on("loaded", args => {
var sender = <Label>args.object; let sender = <Label>args.object;
if (sender.ios) { if (sender.ios) {
var uiFont = _getUIFont(label); let uiFont = _getUIFont(label);
sender.text += `\niOS Font: ${uiFont.fontName};`; sender.text += `\niOS Font: ${uiFont.fontName};`;
if (genericFontFamilies.indexOf(fontFamily) !== -1) { if (genericFontFamilies.indexOf(fontFamily) !== -1) {
return; return;

10
apps/app/ui-tests-app/pages/touch-event.ts
View File

@ -2,21 +2,21 @@
import * as gestures from "tns-core-modules/ui/gestures"; import * as gestures from "tns-core-modules/ui/gestures";
export function onTouch(args: gestures.TouchGestureEventData) { export function onTouch(args: gestures.TouchGestureEventData) {
var msg = " touch action: " + args.action + let msg = " touch action: " + args.action +
" x: " + Math.round(args.getX()) + " y: " + Math.round(args.getY()) + " x: " + Math.round(args.getX()) + " y: " + Math.round(args.getY()) +
" count: " + args.getPointerCount(); " count: " + args.getPointerCount();
var p; let p;
msg += " ACTIVE: "; msg += " ACTIVE: ";
var pointers = args.getActivePointers(); let pointers = args.getActivePointers();
for (var index = 0; index < pointers.length; index++) { for (let index = 0; index < pointers.length; index++) {
p = pointers[index]; p = pointers[index];
msg += " p" + index + "[" + Math.round(p.getX()) + ", " + Math.round(p.getY()) + "]" msg += " p" + index + "[" + Math.round(p.getX()) + ", " + Math.round(p.getY()) + "]"
} }
msg += " ALL: "; msg += " ALL: ";
pointers = args.getAllPointers(); pointers = args.getAllPointers();
for (var index = 0; index < pointers.length; index++) { for (let index = 0; index < pointers.length; index++) {
p = pointers[index]; p = pointers[index];
msg += " p" + index + "[" + Math.round(p.getX()) + ", " + Math.round(p.getY()) + "]" msg += " p" + index + "[" + Math.round(p.getX()) + ", " + Math.round(p.getY()) + "]"
} }