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

Fix the last several errors

Browse Source
This commit is contained in:
PanayotCankov
2016-12-20 13:24:32 +02:00
parent 6122c44126
commit d10ca1da03
26 changed files with 147 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app/ui-tests-app/layouts-percent/grid.ts
View File

@ -9,9 +9,11 @@ export function onLoaded(args: { eventName: string, object: any }) {
}
export function onAddRowColumn(args: { eventName: string, object: any }) {
var layout = <GridLayout>args.object.parent.parent;
var row = new ItemSpec(1, GridUnitType.AUTO);
var column = new ItemSpec(1, GridUnitType.AUTO);
layout.addRow(row);
layout.addColumn(column);

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

@ -1,4 +1,4 @@
import { LayoutBase, View, Observable, HorizontalAlignment, VerticalAlignment, Visibility} from "ui/layouts/layout-base";
import { LayoutBase, View, Observable, HorizontalAlignment, VerticalAlignment, Visibility} from "ui/layouts/layout-base";
export class ViewModel extends Observable {
@ -42,32 +42,34 @@ export class ViewModel extends Observable {
public onAlignments(args: { eventName: string, object: any }): void {
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;
if (view.horizontalAlignment === "stretch") {
view.horizontalAlignment = "left";
view.verticalAlignment = "top";
} else if (view.horizontalAlignment === "left") {
view.horizontalAlignment = "center";
view.verticalAlignment = "middle";
} else if (view.horizontalAlignment === "center") {
view.horizontalAlignment = "right";
view.verticalAlignment = "bottom";
} else {
view.horizontalAlignment = HorizontalAlignment.STRETCH;
view.verticalAlignment = VerticalAlignment.STRETCH;
view.horizontalAlignment = "stretch";
view.verticalAlignment = "stretch";
}
}
public onCollapse(args: { eventName: string, object: any }): void {
var view: View = <View>args.object;
view.visibility = Visibility.COLLAPSE;
view.visibility = "collapse";
}
public onVisibile(args: { eventName: string, object: any }): void {
var view: View = <View>args.object;
var layout = <LayoutBase>view.parent;
var child = <View>layout.getViewById("collapse");
child.visibility = Visibility.VISIBLE;
var child = layout.getViewById<View>("collapse");
child.visibility = "visible";
}
// Layout properties

6
apps/app/ui-tests-app/layouts/grid.ts
View File

@ -9,9 +9,11 @@ export function onLoaded(args: { eventName: string, object: any }) {
}
export function onAddRowColumn(args: { eventName: string, object: any }) {
var layout = <GridLayout>args.object.parent.parent;
var row = new ItemSpec(1, GridUnitType.AUTO);
var column = new ItemSpec(1, GridUnitType.AUTO);
var row = new ItemSpec(1, "auto");
var column = new ItemSpec(1, "auto");
layout.addRow(row);
layout.addColumn(column);

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

@ -42,24 +42,24 @@ export class ViewModel extends Observable {
public onAlignments(args: { eventName: string, object: any }): void {
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;
if (view.horizontalAlignment === "stretch") {
view.horizontalAlignment = "left";
view.verticalAlignment = "top";
} else if (view.horizontalAlignment === "left") {
view.horizontalAlignment = "center";
view.verticalAlignment = "middle";
} else if (view.horizontalAlignment === "center") {
view.horizontalAlignment = "right";
view.verticalAlignment = "bottom";
} else {
view.horizontalAlignment = HorizontalAlignment.STRETCH;
view.verticalAlignment = VerticalAlignment.STRETCH;
view.horizontalAlignment = "stretch";
view.verticalAlignment = "stretch";
}
}
public onCollapse(args: { eventName: string, object: any }): void {
var view: View = <View>args.object;
view.visibility = Visibility.COLLAPSE;
view.visibility = "collapse";
}
public onVisibile(args: { eventName: string, object: any }): void {
@ -67,7 +67,7 @@ export class ViewModel extends Observable {
var layout = <LayoutBase>view.parent;
var child = <View>layout.getViewById("collapse");
child.visibility = Visibility.VISIBLE;
child.visibility = "visible";
}
// Layout properties

2
apps/app/ui-tests-app/pages/pan-event.ts
View File

@ -7,7 +7,7 @@ import { TextView } from "ui/text-view";
var view: View;
export function navigatingTo(args: EventData) {
var page = <Page>args.object;
view = <View>page.getViewById("target");
view = page.getViewById<View>("target");
}
export function onPan(data: PanGestureEventData) {

2
apps/app/ui-tests-app/tab-view/tab-view-icon.ts
View File

@ -7,7 +7,9 @@ let iconModes = ["automatic", "alwaysOriginal", "alwaysTemplate", undefined];
export function onChangeRenderingMode(args: EventData){
let button = (<Button>args.object);
let tabView = button.page.getViewById<TabView>("tab-view");
tabView.iosIconRenderingMode = <"automatic" | "alwaysOriginal" | "alwaysTemplate">iconModes[(iconModes.indexOf(tabView.iosIconRenderingMode) + 1) % iconModes.length];
for(let i = 0, length = tabView.items.length; i < length; i++){
(<Button>tabView.items[i].view).text = "" + tabView.iosIconRenderingMode;
}