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

Fix tslint errors.

Browse Source
This commit is contained in:
Hristo Deshev
2016-02-23 16:53:47 +02:00
parent c3331c0efd
commit de6a92f8c6
81 changed files with 266 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/perf-tests/NavigationTest/app.ts
View File

@ -1,8 +1,6 @@
import * as application from "application";
import {NavPage} from "../nav-page";
import {Page} from "ui/page";
import * as trace from "trace";
trace.enable();
trace.setCategories(trace.categories.concat(
trace.categories.NativeLifecycle,

3
apps/perf-tests/custom-transition.android.ts
View File

@ -1,5 +1,4 @@
import transition = require("ui/transition");
import platform = require("platform");
var floatType = java.lang.Float.class.getField("TYPE").get(null);
@ -32,4 +31,4 @@ export class CustomTransition extends transition.Transition {
return animatorSet;
}
}
}

3
apps/perf-tests/custom-transition.ios.ts
View File

@ -1,5 +1,4 @@
import transition = require("ui/transition");
import platform = require("platform");
export class CustomTransition extends transition.Transition {
public animateIOSTransition(containerView: UIView, fromView: UIView, toView: UIView, operation: UINavigationControllerOperation, completion: (finished: boolean) => void): void {
@ -23,4 +22,4 @@ export class CustomTransition extends transition.Transition {
fromView.transform = CGAffineTransformMakeScale(0, 0);
}, completion);
}
}
}

1
apps/perf-tests/nav-page.ts
View File

@ -8,7 +8,6 @@ import {Button} from "ui/button";
import {Label} from "ui/label";
import {TextField} from "ui/text-field";
import {Switch} from "ui/switch";
import {ListPicker} from "ui/list-picker";
import {Slider} from "ui/slider";
import {Color} from "color";
import * as platform from "platform";

4
apps/tests/layouts/absolute-layout-tests.ts
View File

@ -1,8 +1,6 @@
import testModule = require("../ui-test");
import TKUnit = require("../TKUnit");
import viewModule = require("ui/core/view");
import labelModule = require("ui/label");
import helper = require("../ui/helper");
import colorModule = require("color");
import layoutHelper = require("./layout-helper");
import commonTests = require("./common-layout-tests");
@ -129,4 +127,4 @@ export class AbsoluteLayoutTest extends testModule.UITest<absoluteLayoutModule.A
export function createTestCase(): AbsoluteLayoutTest {
return new AbsoluteLayoutTest();
}
}

4
apps/tests/layouts/dock-layout-tests.ts
View File

@ -1,9 +1,7 @@
import pageModule = require("ui/page");
import button = require("ui/button");
import button = require("ui/button");
import {DockLayout} from "ui/layouts/dock-layout";
import TKUnit = require("../TKUnit");
import helper = require("./layout-helper");
import navHelper = require("../ui/helper");
import testModule = require("../ui-test");
import layoutHelper = require("./layout-helper");
import commonTests = require("./common-layout-tests");

15
apps/tests/layouts/grid-layout-tests.ts
View File

@ -3,8 +3,6 @@ import {GridLayout, ItemSpec, GridUnitType} from "ui/layouts/grid-layout";
import {Button} from "ui/button";
import TKUnit = require("../TKUnit");
import view = require("ui/core/view");
import navHelper = require("../ui/helper");
import utils = require("utils/utils");
import builder = require("ui/builder");
import enums = require("ui/enums");
import testModule = require("../ui-test");
@ -292,15 +290,15 @@ export class GridLayoutTest extends testModule.UITest<GridLayout> {
public test_ItemSpec_constructor_throws_onNegativeValue() {
TKUnit.assertThrows(() => {
new ItemSpec(-1, GridUnitType.auto);
return new ItemSpec(-1, GridUnitType.auto);
}, "'value' should be positive number.");
}
public test_ItemSpec_constructor_doesnt_throw_onCorrectType() {
try {
new ItemSpec(1, GridUnitType.auto);
new ItemSpec(1, GridUnitType.star);
new ItemSpec(1, GridUnitType.pixel);
var dummy = new ItemSpec(1, GridUnitType.auto);
dummy = new ItemSpec(1, GridUnitType.star);
dummy = new ItemSpec(1, GridUnitType.pixel);
}
catch (ex) {
TKUnit.assert(false, "ItemSpec type should support auto, star and pixel.");
@ -309,7 +307,7 @@ export class GridLayoutTest extends testModule.UITest<GridLayout> {
public test_ItemSpec_constructor_throws_onWrongType() {
TKUnit.assertThrows(() => {
new ItemSpec(1, "unsupported");
return new ItemSpec(1, "unsupported");
}, "'ItemSpec type' incorrect value.");
}
@ -529,7 +527,6 @@ export class GridLayoutTest extends testModule.UITest<GridLayout> {
}
private assertRows(grid: GridLayout) {
var columns: Array<ItemSpec> = grid.getColumns();
var rows: Array<ItemSpec> = grid.getRows();
TKUnit.assertEqual(rows.length, 4, "rows.length");
@ -727,4 +724,4 @@ export class GridLayoutTest extends testModule.UITest<GridLayout> {
export function createTestCase(): GridLayoutTest {
return new GridLayoutTest();
}
}

5
apps/tests/layouts/layout-helper.android.ts
View File

@ -1,5 +1,4 @@
import {View} from "ui/core/view";
import {Button} from "ui/button";
import {Button} from "ui/button";
import {StackLayout} from "ui/layouts/stack-layout";
import {GridLayout} from "ui/layouts/grid-layout";
@ -256,4 +255,4 @@ export function dp(value: number): number {
export function dip(value: number): number {
return utils.layout.toDevicePixels(value);
}
}

5
apps/tests/layouts/layout-helper.d.ts vendored
View File

@ -1,5 +1,4 @@
import {View} from "ui/core/view";
import {Button} from "ui/button";
import {Button} from "ui/button";
import {StackLayout} from "ui/layouts/stack-layout";
import {GridLayout} from "ui/layouts/grid-layout";
@ -82,4 +81,4 @@ export class MyGridLayout extends GridLayout implements MeasuredView {
export function assertMeasure(view: MeasuredView, width: number, height: number, name?: string);
export function assertLayout(view: MeasuredView, left: number, top: number, width: number, height: number, name?: string): void;
export function dip(value: number): number;
export function dp(value: number): number;
export function dp(value: number): number;

7
apps/tests/layouts/stack-layout-tests.ts
View File

@ -1,9 +1,7 @@
import {Page} from "ui/page";
import {StackLayout} from "ui/layouts/stack-layout";
import {StackLayout} from "ui/layouts/stack-layout";
import {Button} from "ui/button";
import TKUnit = require("../TKUnit");
import helper = require("./layout-helper");
import navHelper = require("../ui/helper");
import enums = require("ui/enums");
import utils = require("utils/utils");
import testModule = require("../ui-test");
@ -39,7 +37,6 @@ export class StackLayoutTest extends testModule.UITest<StackLayout> {
public test_Orientation_Change() {
this.waitUntilTestElementLayoutIsValid();
var arrangeCount = this.rootLayout.arrangeCount;
TKUnit.assertEqual(this.rootLayout.orientation, enums.Orientation.vertical, "Default orientation should be Vertical.");
this.rootLayout.orientation = enums.Orientation.horizontal;
@ -316,4 +313,4 @@ export class StackLayoutTest extends testModule.UITest<StackLayout> {
export function createTestCase(): StackLayoutTest {
return new StackLayoutTest();
}
}

3
apps/tests/layouts/wrap-layout-tests.ts
View File

@ -1,6 +1,5 @@
import TKUnit = require("../TKUnit");
import {Label} from "ui/label";
import helper = require("../ui/helper");
import layoutHelper = require("./layout-helper");
import testModule = require("../ui-test");
import commonTests = require("./common-layout-tests");
@ -351,4 +350,4 @@ export class WrapLayoutTest extends testModule.UITest<wrapLayoutModule.WrapLayou
export function createTestCase(): WrapLayoutTest {
return new WrapLayoutTest();
}
}

3
apps/tests/navigation/custom-transition.android.ts
View File

@ -1,5 +1,4 @@
import transition = require("ui/transition");
import platform = require("platform");
var floatType = java.lang.Float.class.getField("TYPE").get(null);
@ -36,4 +35,4 @@ export class CustomTransition extends transition.Transition {
return animatorSet;
}
}
}

3
apps/tests/navigation/custom-transition.ios.ts
View File

@ -1,5 +1,4 @@
import transition = require("ui/transition");
import platform = require("platform");
export class CustomTransition extends transition.Transition {
constructor(duration: number, curve: any) {
@ -27,4 +26,4 @@ export class CustomTransition extends transition.Transition {
fromView.transform = CGAffineTransformMakeScale(0, 0);
}, completion);
}
}
}

3
apps/tests/pages/page5.ts
View File

@ -10,7 +10,6 @@ function printDeviceInfoAndroid() {
console.log("android.os.Build.VERSION.SDK_INT = " + android.os.Build.VERSION.SDK_INT); //android.os.Build.VERSION.SDK_INT = 19
console.log("android.os.Build.VERSION.CODENAME = " + android.os.Build.VERSION.CODENAME); //android.os.Build.VERSION.CODENAME = REL
console.log("android.os.Build.VERSION.RELEASE = " + android.os.Build.VERSION.RELEASE); //android.os.Build.VERSION.RELEASE = 4.4.4
android.os.Build.MANUFACTURER
var metrics: android.util.DisplayMetrics = app.android.context.getResources().getDisplayMetrics();
console.log("metrics.density = " + metrics.density); //metrics.density = 3
console.log("metrics.scaledDensity = " + metrics.scaledDensity); //metrics.scaledDensity = 3
@ -83,4 +82,4 @@ export function createPage() {
page.content = grid;
return page;
}
//export var Page = page;
//export var Page = page;

4
apps/tests/ui/action-bar/action-bar-tests.android.ts
View File

@ -3,7 +3,6 @@ import helper = require("../helper");
import TKUnit = require("../../TKUnit");
import { ActionItem } from "ui/action-bar";
import { Visibility } from "ui/enums";
import fs = require("file-system");
global.moduleMerge(actionTestsCommon, exports);
@ -33,7 +32,6 @@ export function test_navigationButton_visibility() {
page.actionBar.navigationButton = actionItem;
var toolbar = <android.support.v7.widget.Toolbar>(<any>page.actionBar)._toolbar;
var menu = toolbar.getMenu();
TKUnit.assertNotNull(toolbar.getNavigationIcon(), "Visibility does not work");
actionItem.visibility = Visibility.collapse;
@ -42,4 +40,4 @@ export function test_navigationButton_visibility() {
finally {
helper.goBack();
}
}
}

4
apps/tests/ui/action-bar/action-bar-tests.ios.ts
View File

@ -9,8 +9,6 @@ import { Visibility } from "ui/enums";
global.moduleMerge(actionTestsCommon, exports);
var ASYNC = 0.2;
export function test_NavBar_isVisible_when_MenuItems_areSet() {
var page: PageModule.Page;
@ -137,4 +135,4 @@ export function test_navigationButton_visibility() {
finally {
helper.goBack();
}
}
}

15
apps/tests/ui/button/button-tests.ts
View File

@ -113,21 +113,6 @@ var _testSetText = function (views: Array<viewModule.View>) {
TKUnit.assert(actualValue === expectedValue, "Actual: " + actualValue + "; Expected: " + expectedValue);
}
var _testSetTextWrap = function (views: Array<viewModule.View>) {
var button = <buttonModule.Button>views[0];
// <snippet module="ui/button" title="button">
// ### Setting the text of a button
// ``` JavaScript
button.textWrap = true;
// ```
// </snippet>
var expectedValue = button.textWrap;
var actualValue = buttonTestsNative.getNativeTextWrap(button);
TKUnit.assert(actualValue === expectedValue, "Actual: " + actualValue + "; Expected: " + expectedValue);
}
var _testOnClick = function (views: Array<viewModule.View>) {
var button = <buttonModule.Button>views[0];

4
apps/tests/ui/helper.ts
View File

@ -176,6 +176,7 @@ export function buildUIWithWeakRefAndInteract<T extends view.View>(createFunc: (
sp.removeChild(weakRef.get());
if (newPage.ios) {
/* tslint:disable:no-unused-expression */
// Could cause GC on the next call.
// NOTE: Don't replace this with forceGC();
new ArrayBuffer(4 * 1024 * 1024);
@ -237,9 +238,10 @@ export function assertAreClose(actual: number, expected: number, message: string
export function forceGC() {
if (platform.device.os === platform.platformNames.ios) {
/* tslint:disable:no-unused-expression */
// Could cause GC on the next call.
new ArrayBuffer(4 * 1024 * 1024);
TKUnit.wait(ASYNC);
}
utils.GC();
}
}

48
apps/tests/ui/list-view/list-view-tests.ts
View File

@ -1,9 +1,6 @@
import testModule = require("../../ui-test");
import TKUnit = require("../../TKUnit");
import testRunner = require("../../testRunner");
import app = require("application");
import helper = require("../helper");
import viewModule = require("ui/core/view");
import observable = require("data/observable");
import types = require("utils/types");
import platform = require("platform");
@ -637,36 +634,37 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
this.assertNoMemoryLeak(weakRef);
}
private test_view_in_itemLoading_is_not_collected_prematurely() {
let weakRef: WeakRef<labelModule.Label>;
//private test_view_in_itemLoading_is_not_collected_prematurely() {
//let weakRef: WeakRef<labelModule.Label>;
let handler = function (args: listViewModule.ItemEventData) {
let lbl = new labelModule.Label();
lbl.text = args.index.toString();
weakRef = new WeakRef(lbl);
args.view = lbl;
let listView: listViewModule.ListView = <listViewModule.ListView>args.object;
listView.off("itemLoading", handler);
};
//let handler = function (args: listViewModule.ItemEventData) {
//let lbl = new labelModule.Label();
//lbl.text = args.index.toString();
//weakRef = new WeakRef(lbl);
//args.view = lbl;
//let listView: listViewModule.ListView = <listViewModule.ListView>args.object;
//listView.off("itemLoading", handler);
//};
this.testView.on("itemLoading", handler);
this.testView.items = [1];
TKUnit.waitUntilReady(() => { return this.getNativeViewCount(this.testView) === this.testView.items.length; }, ASYNC);
//this.testView.on("itemLoading", handler);
//this.testView.items = [1];
//TKUnit.waitUntilReady(() => { return this.getNativeViewCount(this.testView) === this.testView.items.length; }, ASYNC);
if (platform.device.os === platform.platformNames.ios) {
// Could cause GC on the next call.
// NOTE: Don't replace this with forceGC();
new ArrayBuffer(4 * 1024 * 1024);
}
utils.GC();
//if (platform.device.os === platform.platformNames.ios) {
//// Could cause GC on the next call.
//// NOTE: Don't replace this with forceGC();
//new ArrayBuffer(4 * 1024 * 1024);
//}
//utils.GC();
TKUnit.assert(weakRef.get(), weakRef.get() + " died prematurely!");
}
//TKUnit.assert(weakRef.get(), weakRef.get() + " died prematurely!");
//}
private assertNoMemoryLeak(weakRef: WeakRef<listViewModule.ListView>) {
this.tearDown();
TKUnit.waitUntilReady(() => {
if (platform.device.os === platform.platformNames.ios) {
/* tslint:disable:no-unused-expression */
// Could cause GC on the next call.
// NOTE: Don't replace this with forceGC();
new ArrayBuffer(4 * 1024 * 1024);
@ -777,4 +775,4 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
export function createTestCase(): ListViewTest {
return new ListViewTest();
}
}

3
apps/tests/ui/page/page-tests-common.ts
View File

@ -27,7 +27,6 @@ import LabelModule = require("ui/label");
import stackLayoutModule = require("ui/layouts/stack-layout");
import helper = require("../helper");
import view = require("ui/core/view");
import platform = require("platform");
import observable = require("data/observable");
export function addLabelToPage(page: PageModule.Page, text?: string) {
@ -476,4 +475,4 @@ export function test_WhenNavigatingForwardAndBack_IsBackNavigationIsCorrect() {
// helper.goBack
// helper.goBack();
// }
//}
//}

1
apps/tests/ui/proxy-view-container/proxy-view-container-tests.ts
View File

@ -4,7 +4,6 @@ import {View} from "ui/core/view";
import {Button} from "ui/button";
import {Page} from "ui/page";
import {ScrollView} from "ui/scroll-view";
import {TabView, TabViewItem} from "ui/tab-view";
import {LayoutBase} from "ui/layouts/layout-base"
import {StackLayout} from "ui/layouts/stack-layout"
import {GridLayout} from "ui/layouts/grid-layout"

5
apps/tests/ui/scroll-view/scroll-view-tests.ts
View File

@ -1,8 +1,6 @@
import TKUnit = require("../../TKUnit");
import app = require("application");
import helper = require("../helper");
import buttonModule = require("ui/button");
import page = require("ui/page");
import button = require("ui/button");
import enums = require("ui/enums");
import testModule = require("../../ui-test");
@ -45,6 +43,7 @@ class ScrollLayoutTest extends testModule.UITest<scrollViewModule.ScrollView> {
}
public test_snippets() {
/* tslint:disable:no-unused-variable */
// <snippet module="ui/scroll-view" title="scroll-view">
// ### Creating a ScrollView
// ``` JavaScript
@ -263,4 +262,4 @@ class ScrollLayoutTest extends testModule.UITest<scrollViewModule.ScrollView> {
export function createTestCase(): ScrollLayoutTest {
return new ScrollLayoutTest();
}
}

256
apps/tests/ui/tab-view/tab-view-navigation-tests.ts
View File

@ -1,70 +1,58 @@
import TKUnit = require("../../TKUnit");
import helper = require("../helper");
import {Label} from "ui/label";
import {StackLayout} from "ui/layouts/stack-layout";
import frameModule = require("ui/frame");
import {Page} from "ui/page";
import {ListView, ItemEventData} from "ui/list-view";
import {TabView, TabViewItem} from "ui/tab-view";
import {Button} from "ui/button";
//function _createTabView(): TabView {
//var tabView = new TabView();
//tabView.id = "TabView";
//return tabView;
//}
var ASYNC = 2;
//function _createItems(count: number): Array<TabViewItem> {
//var items = new Array<TabViewItem>();
//for (var i = 0; i < count; i++) {
//var label = new Label();
//label.text = "Tab " + i;
//var tabEntry = new TabViewItem({
//title: "Tab " + i,
//view: label
//});
//items.push(tabEntry);
//}
//return items;
//}
function _createTabView(): TabView {
var tabView = new TabView();
tabView.id = "TabView";
return tabView;
}
//function _createListView(): ListView {
//var listView = new ListView();
//listView.id = "ListView";
//var items = Array.apply(null, Array(10)).map(function (_, i) { return i; });
function _createItems(count: number): Array<TabViewItem> {
var items = new Array<TabViewItem>();
for (var i = 0; i < count; i++) {
var label = new Label();
label.text = "Tab " + i;
var tabEntry = new TabViewItem({
title: "Tab " + i,
view: label
});
items.push(tabEntry);
}
return items;
}
//listView.on(ListView.itemLoadingEvent, function (args: ItemEventData) {
//var button = <Button>args.view;
//if (!button) {
//button = new Button();
//args.view = button;
//}
function _createListView(): ListView {
var listView = new ListView();
listView.id = "ListView";
var items = Array.apply(null, Array(10)).map(function (_, i) { return i; });
//button.text = "Button" + args.index;
//button.id = button.text;
//button.on(Button.tapEvent, _clickHandlerFactory(args.index));
//});
listView.on(ListView.itemLoadingEvent, function (args: ItemEventData) {
var button = <Button>args.view;
if (!button) {
button = new Button();
args.view = button;
}
//listView.items = items;
button.text = "Button" + args.index;
button.id = button.text;
button.on(Button.tapEvent, _clickHandlerFactory(args.index));
});
//return listView;
//}
listView.items = items;
//var _clickHandlerFactory = function (index: number) {
//return function () {
//var pageFactory = function (): Page {
//var detailsLabel = new Label();
//detailsLabel.text = "Details Page " + index;
//var detailsPage = new Page();
//detailsPage.content = detailsLabel;
//return detailsPage;
//};
return listView;
}
var _clickHandlerFactory = function (index: number) {
return function () {
var pageFactory = function (): Page {
var detailsLabel = new Label();
detailsLabel.text = "Details Page " + index;
var detailsPage = new Page();
detailsPage.content = detailsLabel;
return detailsPage;
};
helper.navigate(pageFactory);
}
}
//helper.navigate(pageFactory);
//}
//}
export function testWhenNavigatingBackToANonCachedPageContainingATabViewWithAListViewTheListViewIsThere() {
/*
@ -136,92 +124,92 @@ export function testLoadedAndUnloadedAreFired_WhenNavigatingAwayAndBack_WithPage
testLoadedAndUnloadedAreFired_WhenNavigatingAwayAndBack(true);
}
*/
function testLoadedAndUnloadedAreFired_WhenNavigatingAwayAndBack(enablePageCache: boolean) {
var i: number;
var itemCount = 3;
var loadedItems = [0, 0, 0];
var unloadedItems = [0, 0, 0];
//function testLoadedAndUnloadedAreFired_WhenNavigatingAwayAndBack(enablePageCache: boolean) {
//var i: number;
//var itemCount = 3;
//var loadedItems = [0, 0, 0];
//var unloadedItems = [0, 0, 0];
var topFrame = frameModule.topmost();
var oldChache;
//var topFrame = frameModule.topmost();
//var oldChache;
if (topFrame.android) {
oldChache = topFrame.android.cachePagesOnNavigate;
topFrame.android.cachePagesOnNavigate = enablePageCache;
}
//if (topFrame.android) {
//oldChache = topFrame.android.cachePagesOnNavigate;
//topFrame.android.cachePagesOnNavigate = enablePageCache;
//}
try {
var tabView = _createTabView();
var items = _createItems(itemCount);
tabView.items = items;
//try {
//var tabView = _createTabView();
//var items = _createItems(itemCount);
//tabView.items = items;
function createLoadedFor(itemIndex: number) {
return function () {
loadedItems[itemIndex] = loadedItems[itemIndex] + 1;
}
}
//function createLoadedFor(itemIndex: number) {
//return function () {
//loadedItems[itemIndex] = loadedItems[itemIndex] + 1;
//}
//}
function createUnloadedFor(itemIndex: number) {
return function () {
unloadedItems[itemIndex] = unloadedItems[itemIndex] + 1;
}
}
//function createUnloadedFor(itemIndex: number) {
//return function () {
//unloadedItems[itemIndex] = unloadedItems[itemIndex] + 1;
//}
//}
helper.buildUIAndRunTest(tabView, function () {
try {
TKUnit.waitUntilReady(() => { return items[0].view.isLoaded; }, ASYNC);
//helper.buildUIAndRunTest(tabView, function () {
//try {
//TKUnit.waitUntilReady(() => { return items[0].view.isLoaded; }, ASYNC);
// Attach to loaded/unloaded events
for (i = 0; i < itemCount; i++) {
items[i].view.on("loaded", createLoadedFor(i));
items[i].view.on("unloaded", createUnloadedFor(i));
}
//// Attach to loaded/unloaded events
//for (i = 0; i < itemCount; i++) {
//items[i].view.on("loaded", createLoadedFor(i));
//items[i].view.on("unloaded", createUnloadedFor(i));
//}
var detailsPageFactory = function (): Page {
var detailsPage = new Page();
detailsPage.content = new Label();
return detailsPage;
};
//var detailsPageFactory = function (): Page {
//var detailsPage = new Page();
//detailsPage.content = new Label();
//return detailsPage;
//};
helper.navigate(detailsPageFactory);
}
finally {
// Go back to the test page.
helper.goBack();
}
//helper.navigate(detailsPageFactory);
//}
//finally {
//// Go back to the test page.
//helper.goBack();
//}
TKUnit.waitUntilReady(() => { return items[0].view.isLoaded; }, ASYNC);
//TKUnit.waitUntilReady(() => { return items[0].view.isLoaded; }, ASYNC);
//console.log(">>>>>>>>>>>>> loaded items: " + loadedItems.join(", "));
//console.log(">>>>>>>>>>>>> unloadedItems items: " + unloadedItems.join(", "));
////console.log(">>>>>>>>>>>>> loaded items: " + loadedItems.join(", "));
////console.log(">>>>>>>>>>>>> unloadedItems items: " + unloadedItems.join(", "));
// Check that at least the first item is loaded and unloaded
TKUnit.assert(items[0].view.isLoaded, "The content of the first tab should be loaded.");
TKUnit.assertEqual(loadedItems[0], 1, "loaded count for 1st item");
TKUnit.assertEqual(unloadedItems[0], 1, "unloaded count for 1st item");
//// Check that at least the first item is loaded and unloaded
//TKUnit.assert(items[0].view.isLoaded, "The content of the first tab should be loaded.");
//TKUnit.assertEqual(loadedItems[0], 1, "loaded count for 1st item");
//TKUnit.assertEqual(unloadedItems[0], 1, "unloaded count for 1st item");
// Check that loaded/unloaded coutns are equal for all tabs
for (i = 0; i < itemCount; i++) {
TKUnit.assert(loadedItems[i] === unloadedItems[i],
"Loaded and unloaded calls are not equal for item " + i + " loaded: " + loadedItems[i] + " unloaded: " + unloadedItems[i]);
}
});
}
finally {
// Return original page cache value
if (topFrame.android) {
topFrame.android.cachePagesOnNavigate = oldChache;
}
}
}
//// Check that loaded/unloaded coutns are equal for all tabs
//for (i = 0; i < itemCount; i++) {
//TKUnit.assert(loadedItems[i] === unloadedItems[i],
//"Loaded and unloaded calls are not equal for item " + i + " loaded: " + loadedItems[i] + " unloaded: " + unloadedItems[i]);
//}
//});
//}
//finally {
//// Return original page cache value
//if (topFrame.android) {
//topFrame.android.cachePagesOnNavigate = oldChache;
//}
//}
//}
function _clickTheFirstButtonInTheListViewNatively(tabView: TabView) {
if (tabView.android) {
var viewPager: android.support.v4.view.ViewPager = (<any>tabView)._viewPager;
var androidListView = <android.widget.ListView>viewPager.getChildAt(0);
(<android.widget.Button>androidListView.getChildAt(0)).performClick();
}
else {
(<UIButton>(<UITableView>tabView.ios.viewControllers[0].view.subviews[0]).cellForRowAtIndexPath(NSIndexPath.indexPathForItemInSection(0, 0)).contentView.subviews[0]).sendActionsForControlEvents(UIControlEvents.UIControlEventTouchUpInside);
}
}
//function _clickTheFirstButtonInTheListViewNatively(tabView: TabView) {
//if (tabView.android) {
//var viewPager: android.support.v4.view.ViewPager = (<any>tabView)._viewPager;
//var androidListView = <android.widget.ListView>viewPager.getChildAt(0);
//(<android.widget.Button>androidListView.getChildAt(0)).performClick();
//}
//else {
//(<UIButton>(<UITableView>tabView.ios.viewControllers[0].view.subviews[0]).cellForRowAtIndexPath(NSIndexPath.indexPathForItemInSection(0, 0)).contentView.subviews[0]).sendActionsForControlEvents(UIControlEvents.UIControlEventTouchUpInside);
//}
//}

49
apps/tests/ui/tab-view/tab-view-tests.ts
View File

@ -1,16 +1,9 @@
import testModule = require("../../ui-test");
import TKUnit = require("../../TKUnit");
import helper = require("../helper");
import viewModule = require("ui/core/view");
import labelModule = require("ui/label");
import stackLayoutModule = require("ui/layouts/stack-layout");
import tabViewTestsNative = require("./tab-view-tests-native");
import frameModule = require("ui/frame");
import pageModule = require("ui/page");
import listViewModule = require("ui/list-view");
import buttonModule = require("ui/button");
import observable = require("data/observable");
import builder = require("ui/builder");
// <snippet module="ui/tab-view" title="TabView">
// # TabView
@ -41,8 +34,6 @@ import tabViewModule = require("ui/tab-view");
// ```
// </snippet>
var ASYNC = 2;
export class TabViewTest extends testModule.UITest<tabViewModule.TabView> {
public create(): tabViewModule.TabView {
@ -56,7 +47,7 @@ export class TabViewTest extends testModule.UITest<tabViewModule.TabView> {
return tabView;
}
private _createItems(count: number): Array<tabViewModule.TabViewItem> {
_createItems(count: number): Array<tabViewModule.TabViewItem> {
var items = new Array<tabViewModule.TabViewItem>();
for (var i = 0; i < count; i++) {
var label = new labelModule.Label();
@ -70,42 +61,6 @@ export class TabViewTest extends testModule.UITest<tabViewModule.TabView> {
return items;
}
private _createListView(): listViewModule.ListView {
var listView = new listViewModule.ListView();
listView.id = "ListView";
var items = Array.apply(null, Array(10)).map(function (_, i) { return i; });
listView.on(listViewModule.ListView.itemLoadingEvent, function (args: listViewModule.ItemEventData) {
var button = <buttonModule.Button>args.view;
if (!button) {
button = new buttonModule.Button();
args.view = button;
}
button.text = "Button" + args.index;
button.id = button.text;
button.on(buttonModule.Button.tapEvent, this._clickHandlerFactory(args.index));
});
listView.items = items;
return listView;
}
private _clickHandlerFactory = function (index: number) {
return function () {
var pageFactory = function (): pageModule.Page {
var detailsLabel = new labelModule.Label();
detailsLabel.text = "Details Page " + index;
var detailsPage = new pageModule.Page();
detailsPage.content = detailsLabel;
return detailsPage;
};
helper.navigate(pageFactory);
}
}
public testWhenTabViewIsCreatedItemsAreUndefined = function () {
TKUnit.assertEqual(this.testView.items, undefined, "Items should be undefined initally.");
}
@ -392,4 +347,4 @@ export class TabViewTest extends testModule.UITest<tabViewModule.TabView> {
export function createTestCase(): TabViewTest {
return new TabViewTest();
}
}

3
apps/tests/ui/text-field/text-field-tests.ts
View File

@ -1,5 +1,4 @@
import TKUnit = require("../../TKUnit");
import testRunner = require("../../testRunner");
import helper = require("../helper");
import viewModule = require("ui/core/view");
import pagesModule = require("ui/page");
@ -468,4 +467,4 @@ export var testMemoryLeak = function (done) {
helper.buildUIWithWeakRefAndInteract(_createTextFieldFunc, function (textField) {
textFieldTestsNative.typeTextNatively(textField, "Hello, world!");
}, done);
}
}

1
apps/tests/ui/text-view/text-view-tests.ts
View File

@ -1,5 +1,4 @@
import TKUnit = require("../../TKUnit");
import testRunner = require("../../testRunner");
import helper = require("../helper");
import viewModule = require("ui/core/view");
import pagesModule = require("ui/page");

4
apps/tests/ui/web-view/web-view-tests.ts
View File

@ -1,6 +1,4 @@
import TKUnit = require("../../TKUnit");
import helper = require("../helper");
import page = require("ui/page");
import testModule = require("../../ui-test");
// <snippet module="ui/web-view" title="WebView">
@ -191,4 +189,4 @@ export class WebViewTest extends testModule.UITest<webViewModule.WebView> {
export function createTestCase(): WebViewTest {
return new WebViewTest();
}
}

4
apps/tests/xml-declaration/template-builder-tests/template-view.ts
View File

@ -1,5 +1,5 @@
import { View, Template } from "ui/core/view"
import { PropertyChangeData, Property, PropertyMetadataSettings } from "ui/core/dependency-observable"
import {Template} from "ui/core/view"
import {Property, PropertyMetadataSettings} from "ui/core/dependency-observable"
import * as proxy from "ui/core/proxy"
import { LayoutBase } from "ui/layouts/layout-base"
import { parse } from "ui/builder"

7
apps/tests/xml-declaration/xml-declaration-tests.ts
View File

@ -14,7 +14,6 @@ import stackLayoutModule = require("ui/layouts/stack-layout");
import {Label} from "ui/label";
import {Page} from "ui/page";
import {Button} from "ui/button";
import {View} from "ui/core/view";
import {TabView} from "ui/tab-view";
import {Observable} from "data/observable";
import {TemplateView} from "./template-builder-tests/template-view";
@ -882,8 +881,6 @@ export function test_EventInTemplate() {
notified = true;
}
var basePath = "xml-declaration/";
var message;
var page = builder.load(__dirname + "/template-builder-tests/event-in-template.xml", pageCode);
TKUnit.assert(view, "Expected the xml to generate a page");
var templateView = <TemplateView>page.getViewById("template-view");
@ -908,8 +905,6 @@ export function test_EventInCodelessFragment() {
notified = true;
}
var basePath = "xml-declaration/";
var message;
var page = builder.load(__dirname + "/template-builder-tests/event-in-codeless-fragment.xml", pageCode);
TKUnit.assert(view, "Expected the xml to generate a page");
var templateView = <TemplateView>page.getViewById("template-view");
@ -971,4 +966,4 @@ export function test_TabViewHasCorrectParentChain() {
var model = new Observable();
model.set("testPassed", false);
helper.navigateToModuleAndRunTest(("." + moduleName + "/mymodulewithxml/TabViewParentChain"), model, testFunc);
}
}

3
apps/ui-tests-app/css/text-decoration.ts
View File

@ -1,5 +1,4 @@
import view = require("ui/core/view");
import observable = require("data/observable");
import label = require("ui/label");
import button = require("ui/button");
import textField = require("ui/text-field");
@ -38,4 +37,4 @@ export function butonTap(args) {
textField.style.textDecoration = "none";
textView.style.textDecoration = "none";
}
}
}

3
apps/ui-tests-app/css/text-transform.ts
View File

@ -1,5 +1,4 @@
import view = require("ui/core/view");
import observable = require("data/observable");
import label = require("ui/label");
import button = require("ui/button");
import textField = require("ui/text-field");
@ -48,4 +47,4 @@ export function butonTap(args) {
//textField.style.textDecoration = "none";
//textView.style.textDecoration = "none";
}
}
}

7
apps/ui-tests-app/mainPage.ts
View File

@ -1,12 +1,7 @@
import button = require("ui/button");
import frame = require("ui/frame");
import gridModule = require("ui/layouts/grid-layout");
import frame = require("ui/frame");
import pages = require("ui/page");
import text = require("ui/text-view");
import fs = require("file-system");
import trace = require("trace");
import observable = require("data/observable");
import view = require("ui/core/view");
import dialogs = require("ui/dialogs");
trace.enable();

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

@ -1,6 +1,4 @@
import {View} from "ui/core/view";
import {Page} from "ui/page";
import {TextView} from "ui/text-view";
import {TextView} from "ui/text-view";
import gestures = require("ui/gestures");
export function onTouch(args: gestures.TouchGestureEventData) {

3
apps/ui-tests-app/transitions/page0.ts
View File

@ -1,5 +1,4 @@
import frame = require("ui/frame");
import pages = require("ui/page");
export function onTap(args) {
var navigationEntry = {
@ -12,4 +11,4 @@ export function onTap(args) {
}
};
frame.topmost().navigate(navigationEntry);
}
}

3
apps/ui-tests-app/transitions/page1.ts
View File

@ -1,5 +1,4 @@
import frame = require("ui/frame");
import pages = require("ui/page");
export function onTap(args) {
var navigationEntry = {
@ -12,4 +11,4 @@ export function onTap(args) {
}
};
frame.topmost().navigate(navigationEntry);
}
}

2
ui/action-bar/action-bar.android.ts
View File

@ -9,8 +9,6 @@ import * as traceModule from "trace";
import * as utilsModule from "utils/utils";
import * as imageSourceModule from "image-source";
import style = require("ui/styling/style");
import font = require("ui/styling/font");
import styling = require("ui/styling");
const R_ID_HOME = 0x0102002c;
const ACTION_ITEM_ID_OFFSET = 1000;

2
ui/action-bar/action-bar.ios.ts
View File

@ -7,8 +7,6 @@ import view = require("ui/core/view");
import utils = require("utils/utils");
import types = require("utils/types");
import style = require("ui/styling/style");
import font = require("ui/styling/font");
import styling = require("ui/styling");
import frame = require("ui/frame");
global.moduleMerge(common, exports);

3
ui/activity-indicator/activity-indicator.android.ts
View File

@ -2,7 +2,6 @@
import dependencyObservable = require("ui/core/dependency-observable");
import proxy = require("ui/core/proxy");
import enums = require("ui/enums");
import styling = require("ui/styling");
import style = require("ui/styling/style");
import view = require("ui/core/view");
@ -76,4 +75,4 @@ export class ActivityIndicatorStyler implements style.Styler {
}
}
ActivityIndicatorStyler.registerHandlers();
ActivityIndicatorStyler.registerHandlers();

3
ui/activity-indicator/activity-indicator.ios.ts
View File

@ -1,7 +1,6 @@
import aiCommon = require("./activity-indicator-common");
import dependencyObservable = require("ui/core/dependency-observable");
import proxy = require("ui/core/proxy");
import styling = require("ui/styling");
import style = require("ui/styling/style");
import view = require("ui/core/view");
@ -60,4 +59,4 @@ export class ActivityIndicatorStyler implements style.Styler {
}
}
ActivityIndicatorStyler.registerHandlers();
ActivityIndicatorStyler.registerHandlers();

3
ui/animation/animation.ios.ts
View File

@ -38,8 +38,6 @@ class AnimationDelegateImpl extends NSObject {
}
animationDidStart(anim: CAAnimation): void {
var nativeView = <UIView>this._propertyAnimation.target._nativeView;
var propertyNameToAnimate = this._propertyAnimation.property;
var value = this._propertyAnimation.value;
(<any>this._propertyAnimation.target)._suspendPresentationLayerUpdates();
@ -409,7 +407,6 @@ export class Animation extends common.Animation implements definition.Animation
private static _createNativeAffineTransform(animation: common.PropertyAnimation): CATransform3D {
var value = animation.value;
var nativeView = <UIView>animation.target._nativeView;
var result:CATransform3D = CATransform3DIdentity;
if (value[common.Properties.translate] !== undefined) {

1
ui/button/button.ios.ts
View File

@ -2,7 +2,6 @@
import stateChanged = require("ui/core/control-state-change");
import style = require("ui/styling/style");
import font = require("ui/styling/font");
import styling = require("ui/styling");
import view = require("ui/core/view");
import utils = require("utils/utils");
import enums = require("ui/enums");

2
ui/core/view.android.ts
View File

@ -7,7 +7,6 @@ import proxy = require("ui/core/proxy");
import gestures = require("ui/gestures");
import * as types from "utils/types";
import style = require("ui/styling/style");
import styling = require("ui/styling");
import enums = require("ui/enums");
import background = require("ui/styling/background");
import {CommonLayoutParams, Thickness} from "ui/styling/style";
@ -17,7 +16,6 @@ global.moduleMerge(viewCommon, exports);
var ANDROID = "_android";
var NATIVE_VIEW = "_nativeView";
var VIEW_GROUP = "_viewGroup";
var OWNER = "_owner";
function onAutomationTextPropertyChanged(data: dependencyObservable.PropertyChangeData) {
var view = <View>data.object;

1
ui/core/view.ios.ts
View File

@ -5,7 +5,6 @@ import utils = require("utils/utils");
import dependencyObservable = require("ui/core/dependency-observable");
import proxy = require("ui/core/proxy");
import style = require("ui/styling/style");
import styling = require("ui/styling");
import enums = require("ui/enums");
import * as backgroundModule from "ui/styling/background";

3
ui/date-picker/date-picker.ios.ts
View File

@ -1,7 +1,6 @@
import common = require("./date-picker-common");
import dependencyObservable = require("ui/core/dependency-observable");
import proxy = require("ui/core/proxy");
import styling = require("ui/styling");
import style = require("ui/styling/style");
import view = require("ui/core/view");
@ -144,4 +143,4 @@ export class DatePickerStyler implements style.Styler {
}
}
DatePickerStyler.registerHandlers();
DatePickerStyler.registerHandlers();

3
ui/frame/frame.android.ts
View File

@ -12,7 +12,6 @@ import transitionModule = require("ui/transition");
global.moduleMerge(frameCommon, exports);
var TAG = "_fragmentTag";
var OWNER = "_owner";
var HIDDEN = "_hidden";
var INTENT_EXTRA = "com.tns.activity";
var ROOT_VIEW = "_rootView";
@ -806,4 +805,4 @@ function getFrameById(frameId: number): Frame {
export function getActivity(): Object {
return NativeActivity;
}
}

1
ui/frame/frame.ios.ts
View File

@ -7,7 +7,6 @@ import utils = require("utils/utils");
import view = require("ui/core/view");
import uiUtils = require("ui/utils");
import * as types from "utils/types";
import * as animationModule from "ui/animation";
import * as transitionModule from "ui/transition";
import application = require("application");

6
ui/gestures/gestures.android.ts
View File

@ -4,7 +4,6 @@ import observable = require("data/observable");
import view = require("ui/core/view");
import trace = require("trace");
import utils = require("utils/utils");
import types = require("utils/types");
global.moduleMerge(common, exports);
@ -427,9 +426,6 @@ class CustomPanGestureDetector {
}
public onTouchEvent(event: android.view.MotionEvent) {
let pointerID = event.getPointerId(event.getActionIndex());
let wasTracking = this.isTracking;
switch (event.getActionMasked()) {
case android.view.MotionEvent.ACTION_UP:
case android.view.MotionEvent.ACTION_CANCEL:
@ -712,4 +708,4 @@ class TouchGestureEventData implements definition.TouchGestureEventData {
return "";
}
}
}

2
ui/image/image.android.ts
View File

@ -3,8 +3,6 @@ import dependencyObservable = require("ui/core/dependency-observable");
import proxy = require("ui/core/proxy");
import * as enumsModule from "ui/enums";
import style = require("ui/styling/style");
import font = require("ui/styling/font");
import styling = require("ui/styling");
import view = require("ui/core/view");
import background = require("ui/styling/background");
import utils = require("utils/utils");

1
ui/label/label.ios.ts
View File

@ -5,7 +5,6 @@ import * as utils from "utils/utils";
import * as backgroundModule from "ui/styling/background";
import view = require("ui/core/view");
import style = require("ui/styling/style");
import styling = require("ui/styling");
global.moduleMerge(common, exports);

3
ui/layouts/grid-layout/grid-layout.ios.ts
View File

@ -1,7 +1,6 @@
import utils = require("utils/utils");
import common = require("./grid-layout-common");
import {View} from "ui/core/view";
import {CommonLayoutParams} from "ui/styling/style";
import {HorizontalAlignment, VerticalAlignment} from "ui/enums";
global.moduleMerge(common, exports);
@ -979,4 +978,4 @@ class MeasureHelper {
}
}
}
}
}

1
ui/layouts/layout-base.ts
View File

@ -151,7 +151,6 @@ export class LayoutBase extends view.CustomLayoutView implements definition.Layo
}
public eachLayoutChild(callback: (child: view.View, isLast: boolean) => void): void {
var index = 0;
var lastChild: view.View = null;
this._eachChildView((cv) => {

3
ui/layouts/stack-layout/stack-layout-common.ts
View File

@ -1,7 +1,6 @@
import definition = require("ui/layouts/stack-layout");
import platform = require("platform");
import {LayoutBase} from "ui/layouts/layout-base";
import {View} from "ui/core/view";
import {Orientation} from "ui/enums";
import {PropertyMetadata} from "ui/core/proxy";
import {Property, PropertyMetadataSettings} from "ui/core/dependency-observable";
@ -22,4 +21,4 @@ export class StackLayout extends LayoutBase implements definition.StackLayout {
set orientation(value: string) {
this._setValue(StackLayout.orientationProperty, value);
}
}
}

3
ui/layouts/wrap-layout/wrap-layout-common.ts
View File

@ -1,7 +1,6 @@
import definition = require("ui/layouts/wrap-layout");
import platform = require("platform");
import {LayoutBase} from "ui/layouts/layout-base";
import {View} from "ui/core/view";
import {Orientation} from "ui/enums";
import {PropertyMetadata} from "ui/core/proxy";
import {Property, PropertyMetadataSettings} from "ui/core/dependency-observable";
@ -42,4 +41,4 @@ export class WrapLayout extends LayoutBase implements definition.WrapLayout {
set itemHeight(value: number) {
this._setValue(WrapLayout.itemHeightProperty, value);
}
}
}

2
ui/page/page-common.ts
View File

@ -3,7 +3,7 @@ import view = require("ui/core/view");
import dts = require("ui/page");
import styleScope = require("../styling/style-scope");
import {ActionBar} from "ui/action-bar";
import {DependencyObservable, PropertyMetadata, PropertyMetadataSettings, PropertyChangeData, Property, ValueSource} from "ui/core/dependency-observable";
import {PropertyMetadataSettings, PropertyChangeData, Property, ValueSource} from "ui/core/dependency-observable";
import * as style from "../styling/style";
import * as fileSystemModule from "file-system";
import * as frameModule from "ui/frame";

4
ui/page/page.ios.ts
View File

@ -6,7 +6,6 @@ import uiUtils = require("ui/utils");
import utils = require("utils/utils");
import {device} from "platform";
import {DeviceType} from "ui/enums";
import observable = require("data/observable");
global.moduleMerge(pageCommon, exports);
@ -36,7 +35,6 @@ class UIViewControllerImpl extends UIViewController {
let isTablet = device.deviceType === DeviceType.Tablet;
let isFullScreen = !owner._UIModalPresentationFormSheet || !isTablet;
let frame = isFullScreen ? UIScreen.mainScreen().bounds : this.view.frame;
let origin = frame.origin;
let size = frame.size;
let width = size.width;
let height = size.height;
@ -318,4 +316,4 @@ export class Page extends pageCommon.Page {
return super._addViewToNativeVisualTree(view);
}
}
}

2
ui/progress/progress.android.ts
View File

@ -1,7 +1,6 @@
import common = require("./progress-common");
import dependencyObservable = require("ui/core/dependency-observable");
import proxy = require("ui/core/proxy");
import styling = require("ui/styling");
import style = require("ui/styling/style");
import view = require("ui/core/view");
@ -67,7 +66,6 @@ export class ProgressStyler implements style.Styler {
}
private static resetBackgroundAndBorderProperty(view: view.View, nativeValue: number) {
var bar = <android.widget.ProgressBar>view._nativeView;
// Do nothing.
}

1
ui/progress/progress.ios.ts
View File

@ -1,7 +1,6 @@
import common = require("./progress-common");
import dependencyObservable = require("ui/core/dependency-observable");
import proxy = require("ui/core/proxy");
import styling = require("ui/styling");
import style = require("ui/styling/style");
import view = require("ui/core/view");

1
ui/search-bar/search-bar.android.ts
View File

@ -4,7 +4,6 @@ import proxy = require("ui/core/proxy");
import color = require("color");
import utils = require("utils/utils")
import * as typesModule from "utils/types";
import styling = require("ui/styling");
import style = require("ui/styling/style");
import view = require("ui/core/view");
import font = require("ui/styling/font");

1
ui/search-bar/search-bar.ios.ts
View File

@ -2,7 +2,6 @@
import dependencyObservable = require("ui/core/dependency-observable");
import proxy = require("ui/core/proxy");
import * as typesModule from "utils/types";
import styling = require("ui/styling");
import style = require("ui/styling/style");
import view = require("ui/core/view");
import font = require("ui/styling/font");

1
ui/segmented-bar/segmented-bar.android.ts
View File

@ -5,7 +5,6 @@ import proxy = require("ui/core/proxy");
import types = require("utils/types");
import style = require("ui/styling/style");
import font = require("ui/styling/font");
import styling = require("ui/styling");
import view = require("ui/core/view");
const R_ID_TABS = 0x01020013;

1
ui/segmented-bar/segmented-bar.ios.ts
View File

@ -6,7 +6,6 @@ import types = require("utils/types");
import * as colorModule from "color";
import style = require("ui/styling/style");
import font = require("ui/styling/font");
import styling = require("ui/styling");
import view = require("ui/core/view");
global.moduleMerge(common, exports);

4
ui/slider/slider.android.ts
View File

@ -2,7 +2,6 @@
import dependencyObservable = require("ui/core/dependency-observable");
import view = require("ui/core/view");
import proxy = require("ui/core/proxy");
import styling = require("ui/styling");
import style = require("ui/styling/style");
function onValuePropertyChanged(data: dependencyObservable.PropertyChangeData) {
@ -116,7 +115,6 @@ export class SliderStyler implements style.Styler {
}
private static resetBackgroundAndBorderProperty(view: view.View, nativeValue: number) {
var bar = <android.widget.SeekBar>view._nativeView;
// Do nothing.
}
@ -136,4 +134,4 @@ export class SliderStyler implements style.Styler {
}
}
SliderStyler.registerHandlers();
SliderStyler.registerHandlers();

3
ui/slider/slider.ios.ts
View File

@ -2,7 +2,6 @@
import dependencyObservable = require("ui/core/dependency-observable");
import view = require("ui/core/view");
import proxy = require("ui/core/proxy");
import styling = require("ui/styling");
import style = require("ui/styling/style");
function onValuePropertyChanged(data: dependencyObservable.PropertyChangeData) {
@ -116,4 +115,4 @@ export class SliderStyler implements style.Styler {
}
}
SliderStyler.registerHandlers();
SliderStyler.registerHandlers();

3
ui/styling/background-common.ts
View File

@ -176,7 +176,6 @@ export class Background implements definition.Background {
}
private static parsePosition(pos: string): { x: CSSValue, y: CSSValue } {
var res = undefined
let values = cssValue(pos);
if (values.length === 2) {
@ -242,4 +241,4 @@ export class Background implements definition.Background {
value1.size === value2.size &&
colorModule.Color.equals(value1.color, value2.color);
}
}
}

1
ui/styling/background.android.ts
View File

@ -101,7 +101,6 @@ export module ad {
let backgroundBoundsF = new android.graphics.RectF(bounds.left + backoffAntialias, bounds.top + backoffAntialias, bounds.right - backoffAntialias, bounds.bottom - backoffAntialias);
let outerRadius = this._cornerRadius * this._density;
let backgroundRadius = Math.max(0, outerRadius - backoffAntialias);
// draw background
if (this.background.color && this.background.color.android) {

3
ui/switch/switch.android.ts
View File

@ -2,7 +2,6 @@
import dependencyObservable = require("ui/core/dependency-observable");
import proxy = require("ui/core/proxy");
import utils = require("utils/utils")
import styling = require("ui/styling");
import style = require("ui/styling/style");
import view = require("ui/core/view");
@ -57,7 +56,6 @@ export class SwitchStyler implements style.Styler {
}
private static resetColorProperty(view: view.View, nativeValue: number) {
var sw = <android.widget.Switch>view._nativeView;
// Do nothing.
}
@ -71,7 +69,6 @@ export class SwitchStyler implements style.Styler {
}
private static resetBackgroundAndBorderProperty(view: view.View, nativeValue: number) {
var sw = <android.widget.Switch>view._nativeView;
// Do nothing.
}

1
ui/switch/switch.ios.ts
View File

@ -2,7 +2,6 @@
import dependencyObservable = require("ui/core/dependency-observable");
import proxy = require("ui/core/proxy");
import * as utils from "utils/utils";
import styling = require("ui/styling");
import style = require("ui/styling/style");
import view = require("ui/core/view");

1
ui/tab-view/tab-view.android.ts
View File

@ -9,7 +9,6 @@ import proxy = require("ui/core/proxy");
import color = require("color");
import style = require("ui/styling/style");
import font = require("ui/styling/font");
import styling = require("ui/styling");
import * as imageSourceModule from "image-source";
var imageSource: typeof imageSourceModule;

2
ui/tab-view/tab-view.ios.ts
View File

@ -9,8 +9,6 @@ import proxy = require("ui/core/proxy");
import color = require("color");
import * as imageSourceModule from "image-source";
import style = require("ui/styling/style");
import font = require("ui/styling/font");
import styling = require("ui/styling");
global.moduleMerge(common, exports);

4
ui/text-base/text-base-styler.android.ts
View File

@ -1,9 +1,7 @@
import view = require("ui/core/view");
import utils = require("utils/utils");
import types = require("utils/types");
import style = require("ui/styling/style");
import font = require("ui/styling/font");
import styling = require("ui/styling");
import enums = require("ui/enums");
export class TextBaseStyler implements style.Styler {
@ -167,4 +165,4 @@ export class TextBaseStyler implements style.Styler {
TextBaseStyler.setWhiteSpaceProperty,
TextBaseStyler.resetWhiteSpaceProperty), "Button");
}
}
}

4
ui/text-base/text-base-styler.ios.ts
View File

@ -1,9 +1,7 @@
import view = require("ui/core/view");
import utils = require("utils/utils");
import types = require("utils/types");
import style = require("ui/styling/style");
import font = require("ui/styling/font");
import styling = require("ui/styling");
import enums = require("ui/enums");
export class TextBaseStyler implements style.Styler {
@ -109,4 +107,4 @@ export class TextBaseStyler implements style.Styler {
TextBaseStyler.setWhiteSpaceProperty,
TextBaseStyler.resetWhiteSpaceProperty), "TextBase");
}
}
}

4
ui/text-base/text-base.ts
View File

@ -75,7 +75,7 @@ export class TextBase extends view.View implements definition.TextBase, formatte
return this.style.textAlignment;
}
set textAlignment(value: string) {
this.style.textAlignment;
this.style.textAlignment = value;
}
get formattedText(): formattedString.FormattedString {
@ -135,4 +135,4 @@ export class TextBase extends view.View implements definition.TextBase, formatte
}
}
tbs.TextBaseStyler.registerHandlers()
tbs.TextBaseStyler.registerHandlers()

39
ui/text-field/text-field.ios.ts
View File

@ -1,18 +1,17 @@
import common = require("./text-field-common");
import dependencyObservable = require("ui/core/dependency-observable");
import proxy = require("ui/core/proxy");
import textBase = require("ui/text-base");
import enums = require("ui/enums");
import styling = require("ui/styling");
import style = require("ui/styling/style");
import view = require("ui/core/view");
import {PropertyChangeData} from "ui/core/dependency-observable";
import {PropertyMetadata} from "ui/core/proxy";
import {TextBase} from "ui/text-base";
import {UpdateTextTrigger} from "ui/enums";
import * as style from "ui/styling/style";
import {View} from "ui/core/view";
function onSecurePropertyChanged(data: dependencyObservable.PropertyChangeData) {
function onSecurePropertyChanged(data: PropertyChangeData) {
var textField = <TextField>data.object;
textField.ios.secureTextEntry = data.newValue;
}
(<proxy.PropertyMetadata>common.secureProperty.metadata).onSetNativeValue = onSecurePropertyChanged;
(<PropertyMetadata>common.secureProperty.metadata).onSetNativeValue = onSecurePropertyChanged;
global.moduleMerge(common, exports);
@ -41,8 +40,8 @@ class UITextFieldDelegateImpl extends NSObject implements UITextFieldDelegate {
public textFieldDidEndEditing(textField: UITextField) {
let owner = this._owner.get();
if (owner) {
if (owner.updateTextTrigger === enums.UpdateTextTrigger.focusLost) {
owner._onPropertyChangedFromNative(textBase.TextBase.textProperty, textField.text);
if (owner.updateTextTrigger === UpdateTextTrigger.focusLost) {
owner._onPropertyChangedFromNative(TextBase.textProperty, textField.text);
}
owner.dismissSoftInput();
@ -53,7 +52,7 @@ class UITextFieldDelegateImpl extends NSObject implements UITextFieldDelegate {
this.firstEdit = false;
let owner = this._owner.get();
if (owner) {
owner._onPropertyChangedFromNative(textBase.TextBase.textProperty, "");
owner._onPropertyChangedFromNative(TextBase.textProperty, "");
}
return true;
@ -78,13 +77,13 @@ class UITextFieldDelegateImpl extends NSObject implements UITextFieldDelegate {
owner.style._updateTextTransform();
textField.selectedTextRange = r;
if (owner.updateTextTrigger === enums.UpdateTextTrigger.textChanged) {
if (owner.updateTextTrigger === UpdateTextTrigger.textChanged) {
if (textField.secureTextEntry && this.firstEdit) {
owner._onPropertyChangedFromNative(textBase.TextBase.textProperty, replacementString);
owner._onPropertyChangedFromNative(TextBase.textProperty, replacementString);
}
else {
let newText = NSString.alloc().initWithString(textField.text).stringByReplacingCharactersInRangeWithString(range, replacementString);
owner._onPropertyChangedFromNative(textBase.TextBase.textProperty, newText);
owner._onPropertyChangedFromNative(TextBase.textProperty, newText);
}
}
}
@ -152,19 +151,19 @@ export class TextField extends common.TextField {
return this._ios;
}
public _onHintPropertyChanged(data: dependencyObservable.PropertyChangeData) {
public _onHintPropertyChanged(data: PropertyChangeData) {
var textField = <TextField>data.object;
textField.ios.placeholder = data.newValue + "";
}
}
export class TextFieldStyler implements style.Styler {
private static setColorProperty(view: view.View, newValue: any) {
private static setColorProperty(view: View, newValue: any) {
var tf: UITextField = <UITextField>view._nativeView;
TextFieldStyler._setTextFieldColor(tf, newValue);
}
private static resetColorProperty(view: view.View, nativeValue: any) {
private static resetColorProperty(view: View, nativeValue: any) {
var tf: UITextField = <UITextField>view._nativeView;
TextFieldStyler._setTextFieldColor(tf, nativeValue);
}
@ -180,7 +179,7 @@ export class TextFieldStyler implements style.Styler {
}
}
private static getNativeColorValue(view: view.View): any {
private static getNativeColorValue(view: View): any {
var tf: UITextField = <UITextField>view._nativeView;
return tf.tintColor;
}
@ -193,4 +192,4 @@ export class TextFieldStyler implements style.Styler {
}
}
TextFieldStyler.registerHandlers();
TextFieldStyler.registerHandlers();

37
ui/text-view/text-view.ios.ts
View File

@ -1,11 +1,10 @@
import common = require("./text-view-common");
import dependencyObservable = require("ui/core/dependency-observable");
import textBase = require("ui/text-base");
import enums = require("ui/enums");
import view = require("ui/core/view");
import style = require("ui/styling/style");
import styling = require("ui/styling");
import types = require("utils/types");
import {PropertyChangeData} from "ui/core/dependency-observable";
import {TextBase} from "ui/text-base";
import {UpdateTextTrigger} from "ui/enums";
import {View} from "ui/core/view";
import * as style from "ui/styling/style";
import {isNullOrUndefined} from "utils/types";
global.moduleMerge(common, exports);
@ -40,8 +39,8 @@ class UITextViewDelegateImpl extends NSObject implements UITextViewDelegate {
public textViewDidEndEditing(textView: UITextView) {
let owner = this._owner.get();
if (owner) {
if (owner.updateTextTrigger === enums.UpdateTextTrigger.focusLost) {
owner._onPropertyChangedFromNative(textBase.TextBase.textProperty, textView.text);
if (owner.updateTextTrigger === UpdateTextTrigger.focusLost) {
owner._onPropertyChangedFromNative(TextBase.textProperty, textView.text);
}
owner.dismissSoftInput();
@ -60,8 +59,8 @@ class UITextViewDelegateImpl extends NSObject implements UITextViewDelegate {
owner.style._updateTextTransform();
textView.selectedRange = range;
if (owner.updateTextTrigger === enums.UpdateTextTrigger.textChanged) {
owner._onPropertyChangedFromNative(textBase.TextBase.textProperty, textView.text);
if (owner.updateTextTrigger === UpdateTextTrigger.textChanged) {
owner._onPropertyChangedFromNative(TextBase.textProperty, textView.text);
}
}
}
@ -95,15 +94,15 @@ export class TextView extends common.TextView {
return this._ios;
}
public _onEditablePropertyChanged(data: dependencyObservable.PropertyChangeData) {
public _onEditablePropertyChanged(data: PropertyChangeData) {
this._ios.editable = data.newValue;
}
public _onHintPropertyChanged(data: dependencyObservable.PropertyChangeData) {
public _onHintPropertyChanged(data: PropertyChangeData) {
this._refreshHintState(data.newValue, this.text);
}
public _onTextPropertyChanged(data: dependencyObservable.PropertyChangeData) {
public _onTextPropertyChanged(data: PropertyChangeData) {
super._onTextPropertyChanged(data);
this._refreshHintState(this.hint, data.newValue);
}
@ -119,25 +118,25 @@ export class TextView extends common.TextView {
public _showHint(hint: string) {
this.ios.textColor = this.ios.textColor ? this.ios.textColor.colorWithAlphaComponent(0.22) : UIColor.blackColor().colorWithAlphaComponent(0.22);
this.ios.text = types.isNullOrUndefined(hint) ? "" : hint + "";
this.ios.text = isNullOrUndefined(hint) ? "" : hint + "";
(<any>this.ios).isShowingHint = true;
}
public _hideHint() {
this.ios.textColor = this.color ? this.color.ios : null;
this.ios.text = types.isNullOrUndefined(this.text) ? "" : this.text + "";
this.ios.text = isNullOrUndefined(this.text) ? "" : this.text + "";
(<any>this.ios).isShowingHint = false;
}
}
export class TextViewStyler implements style.Styler {
// Color methods
private static setColorProperty(v: view.View, newValue: any) {
private static setColorProperty(v: View, newValue: any) {
var textView: UITextView = <UITextView>v._nativeView;
TextViewStyler._setTextViewColor(textView, newValue);
}
private static resetColorProperty(v: view.View, nativeValue: any) {
private static resetColorProperty(v: View, nativeValue: any) {
var textView: UITextView = <UITextView>v._nativeView;
TextViewStyler._setTextViewColor(textView, nativeValue);
}
@ -153,7 +152,7 @@ export class TextViewStyler implements style.Styler {
}
}
private static getNativeColorValue(v: view.View): any {
private static getNativeColorValue(v: View): any {
var textView: UITextView = <UITextView>v._nativeView;
if ((<any>textView).isShowingHint && textView.textColor) {
return textView.textColor.colorWithAlphaComponent(1);

5
ui/time-picker/time-picker.android.ts
View File

@ -1,6 +1,5 @@
import common = require("./time-picker-common");
import dependencyObservable = require("ui/core/dependency-observable");
import utils = require("utils/utils")
import {Owned} from "utils/utils";
global.moduleMerge(common, exports);
@ -18,7 +17,7 @@ export class TimePicker extends common.TimePicker {
var that = new WeakRef(this);
this._listener = new android.widget.TimePicker.OnTimeChangedListener(
<utils.Owned & android.widget.TimePicker.IOnTimeChangedListener>{
<Owned & android.widget.TimePicker.IOnTimeChangedListener>{
get owner() {
return that.get();
},

10
ui/time-picker/time-picker.ios.ts
View File

@ -1,8 +1,6 @@
import common = require("./time-picker-common");
import dependencyObservable = require("ui/core/dependency-observable");
import styling = require("ui/styling");
import style = require("ui/styling/style");
import view = require("ui/core/view");
import {View} from "ui/core/view";
function getDate(hour: number, minute: number): NSDate {
var comps = NSDateComponents.alloc().init();
@ -98,17 +96,17 @@ class UITimePickerChangeHandlerImpl extends NSObject {
export class TimePickerStyler implements style.Styler {
// color
private static setColorProperty(view: view.View, newValue: any) {
private static setColorProperty(view: View, newValue: any) {
var picker = <UIDatePicker>view._nativeView;
picker.setValueForKey(newValue, "textColor");
}
private static resetColorProperty(view: view.View, nativeValue: any) {
private static resetColorProperty(view: View, nativeValue: any) {
var picker = <UIDatePicker>view._nativeView;
picker.setValueForKey(nativeValue, "textColor");
}
private static getColorProperty(view: view.View): any {
private static getColorProperty(view: View): any {
var picker = <UIDatePicker>view._nativeView;
return picker.valueForKey("textColor");
}

15
ui/transition/fade-transition.android.ts
View File

@ -1,19 +1,18 @@
import transition = require("ui/transition");
import platform = require("platform");
import {Transition, AndroidTransitionType} from "ui/transition";
var floatType = java.lang.Float.class.getField("TYPE").get(null);
export class FadeTransition extends transition.Transition {
export class FadeTransition extends Transition {
public createAndroidAnimator(transitionType: string): android.animation.Animator {
var alphaValues = java.lang.reflect.Array.newInstance(floatType, 2);
switch (transitionType) {
case transition.AndroidTransitionType.enter:
case transition.AndroidTransitionType.popEnter:
case AndroidTransitionType.enter:
case AndroidTransitionType.popEnter:
alphaValues[0] = 0;
alphaValues[1] = 1;
break;
case transition.AndroidTransitionType.exit:
case transition.AndroidTransitionType.popExit:
case AndroidTransitionType.exit:
case AndroidTransitionType.popExit:
alphaValues[0] = 1;
alphaValues[1] = 0;
break;
@ -26,4 +25,4 @@ export class FadeTransition extends transition.Transition {
animator.setInterpolator(this.getCurve());
return animator;
}
}
}

15
ui/transition/flip-transition.android.ts
View File

@ -1,10 +1,9 @@
import transition = require("ui/transition");
import platform = require("platform");
import {Transition, AndroidTransitionType} from "ui/transition";
var floatType = java.lang.Float.class.getField("TYPE").get(null);
//http://developer.android.com/training/animation/cardflip.html
export class FlipTransition extends transition.Transition {
export class FlipTransition extends Transition {
private _direction: string;
constructor(direction: string, duration: number, curve: any) {
@ -22,7 +21,7 @@ export class FlipTransition extends transition.Transition {
var rotationY = this._direction === "right" ? 180 : -180;
switch (transitionType) {
case transition.AndroidTransitionType.enter: // card_flip_right_in
case AndroidTransitionType.enter: // card_flip_right_in
objectAnimators = java.lang.reflect.Array.newInstance(android.animation.Animator.class, 3);
values = java.lang.reflect.Array.newInstance(floatType, 2);
@ -48,7 +47,7 @@ export class FlipTransition extends transition.Transition {
animator.setDuration(1);
objectAnimators[2] = animator;
break;
case transition.AndroidTransitionType.exit: // card_flip_right_out
case AndroidTransitionType.exit: // card_flip_right_out
objectAnimators = java.lang.reflect.Array.newInstance(android.animation.Animator.class, 2);
values = java.lang.reflect.Array.newInstance(floatType, 2);
@ -67,7 +66,7 @@ export class FlipTransition extends transition.Transition {
animator.setDuration(1);
objectAnimators[1] = animator;
break;
case transition.AndroidTransitionType.popEnter: // card_flip_left_in
case AndroidTransitionType.popEnter: // card_flip_left_in
objectAnimators = java.lang.reflect.Array.newInstance(android.animation.Animator.class, 3);
values = java.lang.reflect.Array.newInstance(floatType, 2);
@ -93,7 +92,7 @@ export class FlipTransition extends transition.Transition {
animator.setDuration(1);
objectAnimators[2] = animator;
break;
case transition.AndroidTransitionType.popExit: // card_flip_left_out
case AndroidTransitionType.popExit: // card_flip_left_out
objectAnimators = java.lang.reflect.Array.newInstance(android.animation.Animator.class, 2);
values = java.lang.reflect.Array.newInstance(floatType, 2);
@ -117,4 +116,4 @@ export class FlipTransition extends transition.Transition {
animatorSet.playTogether(objectAnimators);
return animatorSet;
}
}
}

1
ui/transition/transition.ios.ts
View File

@ -60,7 +60,6 @@ class AnimatedTransitioning extends NSObject implements UIViewControllerAnimated
}
}
var transitionId = 0;
export class Transition implements definition.Transition {
private _duration: number;
private _curve: UIViewAnimationCurve;

5
utils/debug.ts
View File

@ -1,4 +1,4 @@
import { knownFolders } from "file-system"
import {knownFolders} from "file-system"
export var debug = true;
@ -17,7 +17,6 @@ export class Source {
private _column: number;
private static _source: symbol = Symbol("source");
private static _appRoot: string;
constructor(uri: string, line: number, column: number) {
ensureAppRootPath();
@ -87,4 +86,4 @@ export class SourceError extends ScopeError {
}
get source() { return this._source; }
}
}

9
utils/utils.ios.ts
View File

@ -1,8 +1,7 @@
import dts = require("utils/utils");
import common = require("./utils-common");
import colorModule = require("color");
import {Color} from "color";
import enums = require("ui/enums");
import * as typesModule from "utils/types";
import * as fsModule from "file-system";
global.moduleMerge(common, exports);
@ -178,7 +177,7 @@ export module ios {
}
}
export function getColor(uiColor: UIColor): colorModule.Color {
export function getColor(uiColor: UIColor): Color {
var redRef = new interop.Reference<number>();
var greenRef = new interop.Reference<number>();
var blueRef = new interop.Reference<number>();
@ -190,7 +189,7 @@ export module ios {
var blue = blueRef.value * 255;
var alpha = alphaRef.value * 255;
return new colorModule.Color(alpha, red, green, blue);
return new Color(alpha, red, green, blue);
}
export function isLandscape(): boolean {
@ -255,4 +254,4 @@ class UIDocumentInteractionControllerDelegateImpl extends NSObject implements UI
public documentInteractionControllerRectForPreview(controller: UIDocumentInteractionController): CGRect {
return this.getViewController().view.frame;
}
}
}