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

Fixed ~60 tsc errors

Browse Source
This commit is contained in:
Rossen Hristov
2016-12-20 10:55:49 +02:00
parent 75dba8fab2
commit bde5687273
7 changed files with 94 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/app/ui-tests-app/font/label.ts
View File

@@ -1,9 +1,9 @@
import * as stack from "ui/layouts/stack-layout";
import * as style from "ui/styling/style";
import * as view from "ui/core/view";
import { StackLayout } from "ui/layouts/stack-layout";
import { View, unsetValue, eachDescendant } from "ui/core/view";
export function resetStyles(args) {
var stackLayout = <stack.StackLayout>args.object.parent;
view.eachDescendant(stackLayout, function (v: view.View) {
var stackLayout = <StackLayout>args.object.parent;
eachDescendant(stackLayout, function (v: View) {
v.style.fontFamily = unsetValue;
v.style.fontSize = unsetValue;
v.style.fontStyle = unsetValue;

10
apps/app/ui-tests-app/font/text-field.ts
View File

@@ -1,9 +1,9 @@
import * as stack from "ui/layouts/stack-layout";
import * as style from "ui/styling/style";
import * as view from "ui/core/view";
import { StackLayout } from "ui/layouts/stack-layout";
import { View, unsetValue, eachDescendant } from "ui/core/view";
export function resetStyles(args) {
var stackLayout = <stack.StackLayout>args.object.parent;
view.eachDescendant(stackLayout, function (v: view.View) {
var stackLayout = <StackLayout>args.object.parent;
eachDescendant(stackLayout, function (v: View) {
v.style.fontFamily = unsetValue;
v.style.fontSize = unsetValue;
v.style.fontStyle = unsetValue;

10
apps/app/ui-tests-app/font/text-view.ts
View File

@@ -1,9 +1,9 @@
import * as stack from "ui/layouts/stack-layout";
import * as style from "ui/styling/style";
import * as view from "ui/core/view";
import { StackLayout } from "ui/layouts/stack-layout";
import { View, unsetValue, eachDescendant } from "ui/core/view";
export function resetStyles(args) {
var stackLayout = <stack.StackLayout>args.object.parent;
view.eachDescendant(stackLayout, function (v: view.View) {
var stackLayout = <StackLayout>args.object.parent;
eachDescendant(stackLayout, function (v: View) {
v.style.fontFamily = unsetValue;
v.style.fontSize = unsetValue;
v.style.fontStyle = unsetValue;

9
apps/app/ui-tests-app/issues/issue-3164.ts
View File

@@ -1,6 +1,7 @@
import { Color } from "color";
import { EventData } from "data/observable";
import { Page } from "ui/page";
import { View } from "ui/core/view";
var page: Page;
var borderColor : Color = new Color("#ff0000");
@@ -9,21 +10,21 @@ export function navigatingTo(args: EventData) {
}
export function onSetBorderWidthTo0() {
let buttonElement = page.getViewById("button1");
let buttonElement = <View>page.getViewById("button1");
buttonElement.borderColor = borderColor;
buttonElement.borderWidth = 0;
let labelElement = page.getViewById("label1");
let labelElement = <View>page.getViewById("label1");
labelElement.borderColor = borderColor;
labelElement.borderWidth = 0;
}
export function onSetBorderWidthTo3() {
let buttonElement = page.getViewById("button1");
let buttonElement = <View>page.getViewById("button1");
buttonElement.borderColor = borderColor;
buttonElement.borderWidth = 3;
let labelElement = page.getViewById("label1");
let labelElement = <View>page.getViewById("label1");
labelElement.borderColor = borderColor;
labelElement.borderWidth = 3;
}

77
apps/app/ui-tests-app/layouts-percent/myview.ts
View File

@@ -1,13 +1,10 @@
import * as observable from "data/observable";
import * as enums from "ui/enums";
import * as view from "ui/core/view";
import * as layouts from "ui/layouts/layout-base";
import { LayoutBase, View, Observable, HorizontalAlignment, VerticalAlignment, Visibility} from "ui/layouts/layout-base";
export class ViewModel extends observable.Observable {
export class ViewModel extends Observable {
// View properties
public onWidthHeight(args: { eventName: string, object: any }): void {
var view: view.View = <view.View>args.object;
var view: View = <View>args.object;
if ((<any>view).width !== "50%") {
(<any>view).width = "50%";
(<any>view).height = "50%";
@@ -18,7 +15,7 @@ export class ViewModel extends observable.Observable {
}
public onMinWidthMinHeight(args: { eventName: string, object: any }): void {
var view: view.View = <view.View>args.object;
var view: View = <View>args.object;
if (view.minWidth !== 105) {
view.minWidth = 105;
view.minHeight = 55;
@@ -29,7 +26,7 @@ export class ViewModel extends observable.Observable {
}
public onMargins(args: { eventName: string, object: any }): void {
var view: view.View = <view.View>args.object;
var view: View = <View>args.object;
if ((<any>view).marginLeft !== "10%") {
(<any>view).marginLeft = "10%";
(<any>view).marginTop = "10%";
@@ -44,33 +41,33 @@ export class ViewModel extends observable.Observable {
}
public onAlignments(args: { eventName: string, object: any }): void {
var view: view.View = <view.View>args.object;
if (view.horizontalAlignment === enums.HorizontalAlignment.stretch) {
view.horizontalAlignment = enums.HorizontalAlignment.left;
view.verticalAlignment = enums.VerticalAlignment.top;
} else if (view.horizontalAlignment === enums.HorizontalAlignment.left) {
view.horizontalAlignment = enums.HorizontalAlignment.center;
view.verticalAlignment = enums.VerticalAlignment.center;
} else if (view.horizontalAlignment === enums.HorizontalAlignment.center) {
view.horizontalAlignment = enums.HorizontalAlignment.right;
view.verticalAlignment = enums.VerticalAlignment.bottom;
var view: View = <View>args.object;
if (view.horizontalAlignment === HorizontalAlignment.STRETCH) {
view.horizontalAlignment = HorizontalAlignment.LEFT;
view.verticalAlignment = VerticalAlignment.TOP;
} else if (view.horizontalAlignment === HorizontalAlignment.LEFT) {
view.horizontalAlignment = HorizontalAlignment.CENTER;
view.verticalAlignment = VerticalAlignment.MIDDLE;
} else if (view.horizontalAlignment === HorizontalAlignment.CENTER) {
view.horizontalAlignment = HorizontalAlignment.RIGHT;
view.verticalAlignment = VerticalAlignment.BOTTOM;
} else {
view.horizontalAlignment = enums.HorizontalAlignment.stretch;
view.verticalAlignment = enums.VerticalAlignment.stretch;
view.horizontalAlignment = HorizontalAlignment.STRETCH;
view.verticalAlignment = VerticalAlignment.STRETCH;
}
}
public onCollapse(args: { eventName: string, object: any }): void {
var view: view.View = <view.View>args.object;
view.visibility = enums.Visibility.collapse;
var view: View = <View>args.object;
view.visibility = Visibility.COLLAPSE;
}
public onVisibile(args: { eventName: string, object: any }): void {
var view: view.View = <view.View>args.object;
var layout = <layouts.LayoutBase>view.parent;
var view: View = <View>args.object;
var layout = <LayoutBase>view.parent;
var child = layout.getViewById("collapse");
child.visibility = enums.Visibility.visible;
var child = <View>layout.getViewById("collapse");
child.visibility = Visibility.VISIBLE;
}
// Layout properties
@@ -129,26 +126,26 @@ export class ViewModel extends observable.Observable {
// Alignments
child = layout.getViewById("alignments");
if (child.horizontalAlignment === enums.HorizontalAlignment.stretch) {
child.horizontalAlignment = enums.HorizontalAlignment.left;
child.verticalAlignment = enums.VerticalAlignment.top;
} else if (child.horizontalAlignment === enums.HorizontalAlignment.left) {
child.horizontalAlignment = enums.HorizontalAlignment.center;
child.verticalAlignment = enums.VerticalAlignment.center;
} else if (child.horizontalAlignment === enums.HorizontalAlignment.center) {
child.horizontalAlignment = enums.HorizontalAlignment.right;
child.verticalAlignment = enums.VerticalAlignment.bottom;
if (child.horizontalAlignment === HorizontalAlignment.STRETCH) {
child.horizontalAlignment = HorizontalAlignment.LEFT;
child.verticalAlignment = VerticalAlignment.TOP;
} else if (child.horizontalAlignment === HorizontalAlignment.LEFT) {
child.horizontalAlignment = HorizontalAlignment.CENTER;
child.verticalAlignment = VerticalAlignment.MIDDLE;
} else if (child.horizontalAlignment === HorizontalAlignment.CENTER) {
child.horizontalAlignment = HorizontalAlignment.RIGHT;
child.verticalAlignment = VerticalAlignment.BOTTOM;
} else {
child.horizontalAlignment = enums.HorizontalAlignment.stretch;
child.verticalAlignment = enums.VerticalAlignment.stretch;
child.horizontalAlignment = HorizontalAlignment.STRETCH;
child.verticalAlignment = VerticalAlignment.STRETCH;
}
// Collapse
child = layout.getViewById("collapse");
if (child.visibility === enums.Visibility.visible) {
child.visibility = enums.Visibility.collapse;
if (child.visibility === Visibility.VISIBLE) {
child.visibility = Visibility.COLLAPSE;
} else {
child.visibility = enums.Visibility.visible;
child.visibility = Visibility.VISIBLE;
}
// Paddings

77
apps/app/ui-tests-app/layouts/myview.ts
View File

@@ -1,13 +1,10 @@
import * as observable from "data/observable";
import * as enums from "ui/enums";
import * as view from "ui/core/view";
import * as layouts from "ui/layouts/layout-base";
import { LayoutBase, View, Observable, HorizontalAlignment, VerticalAlignment, Visibility} from "ui/layouts/layout-base";
export class ViewModel extends observable.Observable {
export class ViewModel extends Observable {
// View properties
public onWidthHeight(args: { eventName: string, object: any }): void {
var view: view.View = <view.View>args.object;
var view: View = <View>args.object;
if (view.width !== 30) {
view.width = 30;
view.height = 50;
@@ -18,7 +15,7 @@ export class ViewModel extends observable.Observable {
}
public onMinWidthMinHeight(args: { eventName: string, object: any }): void {
var view: view.View = <view.View>args.object;
var view: View = <View>args.object;
if (view.minWidth !== 105) {
view.minWidth = 105;
view.minHeight = 55;
@@ -29,7 +26,7 @@ export class ViewModel extends observable.Observable {
}
public onMargins(args: { eventName: string, object: any }): void {
var view: view.View = <view.View>args.object;
var view: View = <View>args.object;
if (view.marginLeft !== 5) {
view.marginLeft = 5;
view.marginTop = 5;
@@ -44,33 +41,33 @@ export class ViewModel extends observable.Observable {
}
public onAlignments(args: { eventName: string, object: any }): void {
var view: view.View = <view.View>args.object;
if (view.horizontalAlignment === enums.HorizontalAlignment.stretch) {
view.horizontalAlignment = enums.HorizontalAlignment.left;
view.verticalAlignment = enums.VerticalAlignment.top;
} else if (view.horizontalAlignment === enums.HorizontalAlignment.left) {
view.horizontalAlignment = enums.HorizontalAlignment.center;
view.verticalAlignment = enums.VerticalAlignment.center;
} else if (view.horizontalAlignment === enums.HorizontalAlignment.center) {
view.horizontalAlignment = enums.HorizontalAlignment.right;
view.verticalAlignment = enums.VerticalAlignment.bottom;
var view: View = <View>args.object;
if (view.horizontalAlignment === HorizontalAlignment.STRETCH) {
view.horizontalAlignment = HorizontalAlignment.LEFT;
view.verticalAlignment = VerticalAlignment.TOP;
} else if (view.horizontalAlignment === HorizontalAlignment.LEFT) {
view.horizontalAlignment = HorizontalAlignment.CENTER;
view.verticalAlignment = VerticalAlignment.MIDDLE;
} else if (view.horizontalAlignment === HorizontalAlignment.CENTER) {
view.horizontalAlignment = HorizontalAlignment.RIGHT;
view.verticalAlignment = VerticalAlignment.BOTTOM;
} else {
view.horizontalAlignment = enums.HorizontalAlignment.stretch;
view.verticalAlignment = enums.VerticalAlignment.stretch;
view.horizontalAlignment = HorizontalAlignment.STRETCH;
view.verticalAlignment = VerticalAlignment.STRETCH;
}
}
public onCollapse(args: { eventName: string, object: any }): void {
var view: view.View = <view.View>args.object;
view.visibility = enums.Visibility.collapse;
var view: View = <View>args.object;
view.visibility = Visibility.COLLAPSE;
}
public onVisibile(args: { eventName: string, object: any }): void {
var view: view.View = <view.View>args.object;
var layout = <layouts.LayoutBase>view.parent;
var view: View = <View>args.object;
var layout = <LayoutBase>view.parent;
var child = layout.getViewById("collapse");
child.visibility = enums.Visibility.visible;
var child = <View>layout.getViewById("collapse");
child.visibility = Visibility.VISIBLE;
}
// Layout properties
@@ -129,26 +126,26 @@ export class ViewModel extends observable.Observable {
// Alignments
child = layout.getViewById("alignments");
if (child.horizontalAlignment === enums.HorizontalAlignment.stretch) {
child.horizontalAlignment = enums.HorizontalAlignment.left;
child.verticalAlignment = enums.VerticalAlignment.top;
} else if (child.horizontalAlignment === enums.HorizontalAlignment.left) {
child.horizontalAlignment = enums.HorizontalAlignment.center;
child.verticalAlignment = enums.VerticalAlignment.center;
} else if (child.horizontalAlignment === enums.HorizontalAlignment.center) {
child.horizontalAlignment = enums.HorizontalAlignment.right;
child.verticalAlignment = enums.VerticalAlignment.bottom;
if (child.horizontalAlignment === HorizontalAlignment.STRETCH) {
child.horizontalAlignment = HorizontalAlignment.LEFT;
child.verticalAlignment = VerticalAlignment.TOP;
} else if (child.horizontalAlignment === HorizontalAlignment.LEFT) {
child.horizontalAlignment = HorizontalAlignment.CENTER;
child.verticalAlignment = VerticalAlignment.MIDDLE;
} else if (child.horizontalAlignment === HorizontalAlignment.CENTER) {
child.horizontalAlignment = HorizontalAlignment.RIGHT;
child.verticalAlignment = VerticalAlignment.BOTTOM;
} else {
child.horizontalAlignment = enums.HorizontalAlignment.stretch;
child.verticalAlignment = enums.VerticalAlignment.stretch;
child.horizontalAlignment = HorizontalAlignment.STRETCH;
child.verticalAlignment = VerticalAlignment.MIDDLE;
}
// Collapse
child = layout.getViewById("collapse");
if (child.visibility === enums.Visibility.visible) {
child.visibility = enums.Visibility.collapse;
if (child.visibility === Visibility.VISIBLE) {
child.visibility = Visibility.COLLAPSE;
} else {
child.visibility = enums.Visibility.visible;
child.visibility = Visibility.VISIBLE;
}
// Paddings

5
tns-core-modules/ui/enums/enums.d.ts vendored
View File

@@ -215,11 +215,6 @@
*/
export var visible: string;
/**
* Obsolete. Please use 'collapse' instead!
*/
export var collapsed: string;
/**
* The view is not visible and won't take place in the layout.
*/