diff --git a/CodingConvention.md b/CodingConvention.md index 0427e6643..892261f84 100644 --- a/CodingConvention.md +++ b/CodingConvention.md @@ -696,7 +696,7 @@ Sometimes we need to explicitly check for a type. In such cases use the built-in *Right:* ~~~ {.javascript} -import types = require("utils/types"); +import * as types from "utils/types"; var myVar; if(types.isString(myVar)) { diff --git a/CreateNewModule.md b/CreateNewModule.md index eba39a8e2..48f12eecc 100644 --- a/CreateNewModule.md +++ b/CreateNewModule.md @@ -24,7 +24,7 @@ declare module "foo"{ **Implementation file (foo.ts):** ```javascript -import definition = require("foo"); +import * as definition from "foo"; export function a(){ // do somethign here @@ -53,7 +53,7 @@ declare module "foo"{ **Android implementation file (foo.android.ts):** ```javascript -import definition = require("foo"); +import * as definition from "foo"; // require the definition and put implements clause to ensure API consistency between the declaration and implementation export class Foo implements definition.Foo { @@ -72,7 +72,7 @@ export class Foo implements definition.Foo { **iOS implementation file (foo.ios.ts):** ```javascript -import definition = require("foo"); +import * as definition from "foo"; // require the definition and put implements clause to ensure API consistency between the declaration and implementation export class Foo implements definition.Foo { @@ -109,7 +109,7 @@ declare module "foo"{ **Common implementation file (foo-common.ts):** ```javascript -import definition = require("foo"); +import * as definition from "foo"; // require the definition and put implements clause to ensure API consistency between the declaration and implementation export class Foo implements definition.Foo { @@ -128,7 +128,7 @@ export class Foo implements definition.Foo { **Android implementation file (foo.android.ts):** ```javascript -import common = require("foo-common"); +import * as common from "foo-common"; // require the common file and extend the base common implementation export class Foo extends common.Foo { @@ -148,7 +148,7 @@ export class Foo extends common.Foo { **iOS implementation file (foo.ios.ts):** ```javascript -import common = require("foo-common"); +import * as common from "foo-common"; // require the common file and extend the base common implementation export class Foo extends common.Foo { @@ -215,8 +215,8 @@ export function stopNative(){ **Common implementation file (foo.ts):** ```javascript -import definition = require("foo"); -import fooNative = require("foo-native"); +import * as definition from "foo"; +import * as fooNative from "foo-native"; // require the definition and put implements clause to ensure API consistency between the declaration and implementation export class Foo implements definition.Foo { diff --git a/apps/app/css-perf-test/app.ts b/apps/app/css-perf-test/app.ts index 35d711e7c..03ce124b0 100644 --- a/apps/app/css-perf-test/app.ts +++ b/apps/app/css-perf-test/app.ts @@ -1,4 +1,4 @@ -import application = require("application"); +import * as application from "application"; declare var CACurrentMediaTime; global.time = function(): number { diff --git a/apps/app/cuteness.io/app.ts b/apps/app/cuteness.io/app.ts index 3ab99da3b..93882c854 100644 --- a/apps/app/cuteness.io/app.ts +++ b/apps/app/cuteness.io/app.ts @@ -1,5 +1,5 @@ -import application = require("application"); -import fps = require("fps-meter"); +import * as application from "application"; +import * as fps from "fps-meter"; fps.addCallback(function (fps, minFps) { console.info("fps=" + fps + " minFps=" + minFps); }); diff --git a/apps/app/gallery-app/app.ts b/apps/app/gallery-app/app.ts index 0c4800fb6..2b8d1847d 100644 --- a/apps/app/gallery-app/app.ts +++ b/apps/app/gallery-app/app.ts @@ -1,6 +1,6 @@ -import application = require("application"); +import * as application from "application"; // Needed only for build infrastructure -application.cssFile = "gallery-app/app.css"; +application.setCssFileName("gallery-app/app.css"); application.start({ moduleName: "gallery-app/main-page" }); diff --git a/apps/app/gallery-app/main-page.ts b/apps/app/gallery-app/main-page.ts index 2dd08d525..b60b802a0 100644 --- a/apps/app/gallery-app/main-page.ts +++ b/apps/app/gallery-app/main-page.ts @@ -1,5 +1,5 @@ -import observable = require("data/observable"); -import frame = require("ui/frame"); +import * as observable from "data/observable"; +import * as frame from "ui/frame"; export function itemTap(args: observable.EventData) { frame.topmost().navigate({ diff --git a/apps/app/gallery-app/views/dialogs.ts b/apps/app/gallery-app/views/dialogs.ts index f5dcae035..4e56d114d 100644 --- a/apps/app/gallery-app/views/dialogs.ts +++ b/apps/app/gallery-app/views/dialogs.ts @@ -1,4 +1,4 @@ -import dialogs = require("ui/dialogs"); +import * as dialogs from "ui/dialogs"; export function alertTapped(args) { dialogs.alert("Hi there!"); diff --git a/apps/app/gallery-app/views/list-picker.ts b/apps/app/gallery-app/views/list-picker.ts index 7eafe246a..2b4d3236f 100644 --- a/apps/app/gallery-app/views/list-picker.ts +++ b/apps/app/gallery-app/views/list-picker.ts @@ -1,5 +1,5 @@ -import pages = require("ui/page"); -import observableModule = require("data/observable"); +import * as pages from "ui/page"; +import * as observableModule from "data/observable"; export function onPageLoaded(args: observableModule.EventData) { var page = args.object; diff --git a/apps/app/ui-tests-app/action-bar/action-item-position.ts b/apps/app/ui-tests-app/action-bar/action-item-position.ts index ffbc52da2..5010f276a 100644 --- a/apps/app/ui-tests-app/action-bar/action-item-position.ts +++ b/apps/app/ui-tests-app/action-bar/action-item-position.ts @@ -1,6 +1,6 @@ import { EventData } from "data/observable"; import { Page } from "ui/page"; -import observable = require("data/observable"); +import * as observable from "data/observable"; export function navigatingTo(args: EventData) { let page = args.object; diff --git a/apps/app/ui-tests-app/action-bar/action-view.ts b/apps/app/ui-tests-app/action-bar/action-view.ts index 84b0c257d..f68300e81 100644 --- a/apps/app/ui-tests-app/action-bar/action-view.ts +++ b/apps/app/ui-tests-app/action-bar/action-view.ts @@ -1,4 +1,4 @@ -import frame = require("ui/frame"); +import * as frame from "ui/frame"; export function navigate(args) { frame.topmost().navigate("ui-tests-app/action-bar/clean"); diff --git a/apps/app/ui-tests-app/action-bar/all.ts b/apps/app/ui-tests-app/action-bar/all.ts index 84b0c257d..f68300e81 100644 --- a/apps/app/ui-tests-app/action-bar/all.ts +++ b/apps/app/ui-tests-app/action-bar/all.ts @@ -1,4 +1,4 @@ -import frame = require("ui/frame"); +import * as frame from "ui/frame"; export function navigate(args) { frame.topmost().navigate("ui-tests-app/action-bar/clean"); diff --git a/apps/app/ui-tests-app/action-bar/background-css.ts b/apps/app/ui-tests-app/action-bar/background-css.ts index 84b0c257d..f68300e81 100644 --- a/apps/app/ui-tests-app/action-bar/background-css.ts +++ b/apps/app/ui-tests-app/action-bar/background-css.ts @@ -1,4 +1,4 @@ -import frame = require("ui/frame"); +import * as frame from "ui/frame"; export function navigate(args) { frame.topmost().navigate("ui-tests-app/action-bar/clean"); diff --git a/apps/app/ui-tests-app/action-bar/background.ts b/apps/app/ui-tests-app/action-bar/background.ts index 84b0c257d..f68300e81 100644 --- a/apps/app/ui-tests-app/action-bar/background.ts +++ b/apps/app/ui-tests-app/action-bar/background.ts @@ -1,4 +1,4 @@ -import frame = require("ui/frame"); +import * as frame from "ui/frame"; export function navigate(args) { frame.topmost().navigate("ui-tests-app/action-bar/clean"); diff --git a/apps/app/ui-tests-app/action-bar/clean.ts b/apps/app/ui-tests-app/action-bar/clean.ts index 7837f595e..1d9c2b291 100644 --- a/apps/app/ui-tests-app/action-bar/clean.ts +++ b/apps/app/ui-tests-app/action-bar/clean.ts @@ -1,4 +1,4 @@ -import frame = require("ui/frame"); +import * as frame from "ui/frame"; export function navigate(args) { frame.topmost().goBack(); diff --git a/apps/app/ui-tests-app/action-bar/color.ts b/apps/app/ui-tests-app/action-bar/color.ts index 84b0c257d..f68300e81 100644 --- a/apps/app/ui-tests-app/action-bar/color.ts +++ b/apps/app/ui-tests-app/action-bar/color.ts @@ -1,4 +1,4 @@ -import frame = require("ui/frame"); +import * as frame from "ui/frame"; export function navigate(args) { frame.topmost().navigate("ui-tests-app/action-bar/clean"); diff --git a/apps/app/ui-tests-app/action-bar/system-icons.ts b/apps/app/ui-tests-app/action-bar/system-icons.ts index 84b0c257d..f68300e81 100644 --- a/apps/app/ui-tests-app/action-bar/system-icons.ts +++ b/apps/app/ui-tests-app/action-bar/system-icons.ts @@ -1,4 +1,4 @@ -import frame = require("ui/frame"); +import * as frame from "ui/frame"; export function navigate(args) { frame.topmost().navigate("ui-tests-app/action-bar/clean"); diff --git a/apps/app/ui-tests-app/animations/background.ts b/apps/app/ui-tests-app/animations/background.ts index c0dbf9202..1a48029b2 100644 --- a/apps/app/ui-tests-app/animations/background.ts +++ b/apps/app/ui-tests-app/animations/background.ts @@ -1,7 +1,7 @@ -import observable = require("data/observable"); -import pages = require("ui/page"); -import viewModule = require("ui/core/view"); -import color = require("color"); +import * as observable from "data/observable"; +import * as pages from "ui/page"; +import * as viewModule from "ui/core/view"; +import * as color from "color"; var view: viewModule.View; diff --git a/apps/app/ui-tests-app/app.ts b/apps/app/ui-tests-app/app.ts index ed7faf3dc..4a01afd03 100644 --- a/apps/app/ui-tests-app/app.ts +++ b/apps/app/ui-tests-app/app.ts @@ -1,5 +1,5 @@ -import application = require("application"); -import trace = require("trace"); +import * as application from "application"; +import * as trace from "trace"; trace.enable(); trace.setCategories(trace.categories.concat( trace.categories.NativeLifecycle, @@ -11,12 +11,13 @@ trace.setCategories(trace.categories.concat( var countResume = 0; var countSuspend = 0; -application.onUncaughtError = function (error: application.NativeScriptError) { +application.on("uncaughtError", args => { + const error = args.error; console.warn(error.message); if (error.nativeError) { console.warn("native error: " + error.nativeError); } -} +}); application.on(application.launchEvent, function (args: application.ApplicationEventData) { if (args.android) { diff --git a/apps/app/ui-tests-app/bindings/basics.ts b/apps/app/ui-tests-app/bindings/basics.ts index 2273c5a59..f47d9ed35 100644 --- a/apps/app/ui-tests-app/bindings/basics.ts +++ b/apps/app/ui-tests-app/bindings/basics.ts @@ -1,8 +1,8 @@ -import buttonModule = require("ui/button"); -import pageModule = require("ui/page"); -import textFieldModule = require("ui/text-field"); -import stackLayoutModule = require("ui/layouts/stack-layout"); -import observableModule = require("data/observable"); +import * as buttonModule from "ui/button"; +import * as pageModule from "ui/page"; +import * as textFieldModule from "ui/text-field"; +import * as stackLayoutModule from "ui/layouts/stack-layout"; +import * as observableModule from "data/observable"; export function createPage() { diff --git a/apps/app/ui-tests-app/bindings/xmlbasics.ts b/apps/app/ui-tests-app/bindings/xmlbasics.ts index 018aa5d24..e328c2e0e 100644 --- a/apps/app/ui-tests-app/bindings/xmlbasics.ts +++ b/apps/app/ui-tests-app/bindings/xmlbasics.ts @@ -1,7 +1,7 @@ -import buttonModule = require("ui/button"); -import stackLayoutModule = require("ui/layouts/stack-layout"); -import textFieldModule = require("ui/text-field"); -import observable = require("data/observable"); +import * as buttonModule from "ui/button"; +import * as stackLayoutModule from "ui/layouts/stack-layout"; +import * as textFieldModule from "ui/text-field"; +import * as observable from "data/observable"; export function stack0Loaded(args: observable.EventData) { var source = new observable.Observable(); diff --git a/apps/app/ui-tests-app/css/background.ts b/apps/app/ui-tests-app/css/background.ts index daa8289fc..356dbcb5c 100644 --- a/apps/app/ui-tests-app/css/background.ts +++ b/apps/app/ui-tests-app/css/background.ts @@ -1,5 +1,5 @@ -import view = require("ui/core/view"); -import pages = require("ui/page"); +import * as view from "ui/core/view"; +import * as pages from "ui/page"; export function applyTap(args) { var page = (args.object).page; diff --git a/apps/app/ui-tests-app/css/margins-paddings-with-percentage.ts b/apps/app/ui-tests-app/css/margins-paddings-with-percentage.ts index 6cfde54b6..62ba5a276 100644 --- a/apps/app/ui-tests-app/css/margins-paddings-with-percentage.ts +++ b/apps/app/ui-tests-app/css/margins-paddings-with-percentage.ts @@ -1,7 +1,7 @@ -import view = require("ui/core/view"); -import pages = require("ui/page"); +import * as view from "ui/core/view"; +import * as pages from "ui/page"; import { EventData } from "data/observable"; -import button = require("ui/button"); +import * as button from "ui/button"; var cssPercentage = " Page { margin:5% 10% 15% 8%; background-color: orange; font-size:8; } GridLayout { margin:3%; background-color: lightgreen; font-size:8; } StackLayout { border-color:red; border-width:1px; } StackLayout * { border-color:blue; border-width:1px; } GridLayout { border-color:green;border-width:1px; } .test1 { padding:10%; } .test2 { padding:10%; background-color:lightblue; } .test3 { margin:1% 2% 3% 4%; } WrapLayout { orientation:vertical; width:75%; height:45% } Button { color:black }" var cssWithouPercentage = " Page { margin:15 10 15 30; background-color: orange; font-size:8; } GridLayout { margin:3; background-color: lightgreen; font-size:8; } StackLayout { border-color:red; border-width:1px; } StackLayout * { border-color:blue; border-width:1px; } GridLayout { border-color:green;border-width:1px; } .test1 { padding:10; } .test2 { padding:10; background-color:lightblue; } .test3 { margin:10 20 30 40; } WrapLayout { orientation:vertical; width:100; height:120 } Button { color:black }" diff --git a/apps/app/ui-tests-app/css/text-transform.ts b/apps/app/ui-tests-app/css/text-transform.ts index c648bc3a6..f0f6f30d6 100644 --- a/apps/app/ui-tests-app/css/text-transform.ts +++ b/apps/app/ui-tests-app/css/text-transform.ts @@ -1,8 +1,8 @@ -import view = require("ui/core/view"); -import label = require("ui/label"); -import button = require("ui/button"); -import textField = require("ui/text-field"); -import textView = require("ui/text-view"); +import * as view from "ui/core/view"; +import * as label from "ui/label"; +import * as button from "ui/button"; +import * as textField from "ui/text-field"; +import * as textView from "ui/text-view"; export function changeTextButonTap(args) { var btnChange = args.object; diff --git a/apps/app/ui-tests-app/css/white-space.ts b/apps/app/ui-tests-app/css/white-space.ts index 56b230dde..5eaf421e3 100644 --- a/apps/app/ui-tests-app/css/white-space.ts +++ b/apps/app/ui-tests-app/css/white-space.ts @@ -1,9 +1,9 @@ -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"); -import textView = require("ui/text-view"); +import * as view from "ui/core/view"; +import * as observable from "data/observable"; +import * as label from "ui/label"; +import * as button from "ui/button"; +import * as textField from "ui/text-field"; +import * as textView from "ui/text-view"; export function butonTap(args: observable.EventData) { var btnChange = args.object; diff --git a/apps/app/ui-tests-app/dialogs/dialogs.ts b/apps/app/ui-tests-app/dialogs/dialogs.ts index 43dce02a8..7ff689a1c 100644 --- a/apps/app/ui-tests-app/dialogs/dialogs.ts +++ b/apps/app/ui-tests-app/dialogs/dialogs.ts @@ -1,6 +1,6 @@ -import pages = require("ui/page"); -import observable = require("data/observable"); -import vmModule = require("./view-model"); +import * as pages from "ui/page"; +import * as observable from "data/observable"; +import * as vmModule from "./view-model"; var viewModel = vmModule.settingsViewModel; diff --git a/apps/app/ui-tests-app/dialogs/view-model.ts b/apps/app/ui-tests-app/dialogs/view-model.ts index 138199288..159385884 100644 --- a/apps/app/ui-tests-app/dialogs/view-model.ts +++ b/apps/app/ui-tests-app/dialogs/view-model.ts @@ -1,5 +1,5 @@ -import dialogs = require("ui/dialogs"); -import observable = require("data/observable"); +import * as dialogs from "ui/dialogs"; +import * as observable from "data/observable"; var name = "Harold Finch"; diff --git a/apps/app/ui-tests-app/font/all-fonts.ts b/apps/app/ui-tests-app/font/all-fonts.ts index e31c847f9..0ed3158a3 100644 --- a/apps/app/ui-tests-app/font/all-fonts.ts +++ b/apps/app/ui-tests-app/font/all-fonts.ts @@ -4,7 +4,7 @@ import { StackLayout } from "ui/layouts/stack-layout"; import { ScrollView } from "ui/scroll-view"; import { Label } from "ui/label"; import { FontStyle, FontWeight } from "ui/enums"; -import typeUtils = require("utils/types"); +import * as typeUtils from "utils/types"; import { Color } from "color"; import * as font from "ui/styling/font"; diff --git a/apps/app/ui-tests-app/font/button.ts b/apps/app/ui-tests-app/font/button.ts index 5c6bbee70..535d67f43 100644 --- a/apps/app/ui-tests-app/font/button.ts +++ b/apps/app/ui-tests-app/font/button.ts @@ -1,31 +1,33 @@ -import stack = require("ui/layouts/stack-layout"); -import style = require("ui/styling/style"); -import view = require("ui/core/view"); +import * as stack from "ui/layouts/stack-layout"; +import * as style from "ui/styling/style"; +import * as view from "ui/core/view"; +import { unsetValue } from "ui/core/view"; + export function resetStyles(args) { var stackLayout = args.object.parent.parent; view.eachDescendant(stackLayout, function (v: view.View) { - v.style._resetValue(style.fontFamilyProperty); - v.style._resetValue(style.fontSizeProperty); - v.style._resetValue(style.fontStyleProperty); - v.style._resetValue(style.fontWeightProperty); - v.style._resetValue(style.colorProperty); - v.style._resetValue(style.textAlignmentProperty); - v.style._resetValue(style.paddingLeftProperty); - v.style._resetValue(style.paddingRightProperty); - v.style._resetValue(style.paddingTopProperty); - v.style._resetValue(style.paddingBottomProperty); - v.style._resetValue(style.borderTopColorProperty); - v.style._resetValue(style.borderRightColorProperty); - v.style._resetValue(style.borderBottomColorProperty); - v.style._resetValue(style.borderLeftColorProperty); - v.style._resetValue(style.borderTopWidthProperty); - v.style._resetValue(style.borderRightWidthProperty); - v.style._resetValue(style.borderBottomWidthProperty); - v.style._resetValue(style.borderLeftWidthProperty); - v.style._resetValue(style.borderTopLeftRadiusProperty); - v.style._resetValue(style.borderTopRightRadiusProperty); - v.style._resetValue(style.borderBottomRightRadiusProperty); - v.style._resetValue(style.borderBottomLeftRadiusProperty); + v.style.fontFamily = unsetValue; + v.style.fontSize = unsetValue; + v.style.fontStyle = unsetValue; + v.style.fontWeight = unsetValue; + v.style.color = unsetValue; + v.style.textAlignment = unsetValue; + v.style.paddingLeft = unsetValue; + v.style.paddingRight = unsetValue; + v.style.paddingTop = unsetValue; + v.style.paddingBottom = unsetValue; + v.style.borderTopColor = unsetValue; + v.style.borderRightColor = unsetValue; + v.style.borderBottomColor = unsetValue; + v.style.borderLeftColor = unsetValue; + v.style.borderTopWidth = unsetValue; + v.style.borderRightWidth = unsetValue; + v.style.borderBottomWidth = unsetValue; + v.style.borderLeftWidth = unsetValue; + v.style.borderTopLeftRadius = unsetValue; + v.style.borderTopRightRadius = unsetValue; + v.style.borderBottomRightRadius = unsetValue; + v.style.borderBottomLeftRadius = unsetValue; return true; }); } diff --git a/apps/app/ui-tests-app/font/label.ts b/apps/app/ui-tests-app/font/label.ts index a76943977..4d79ae00b 100644 --- a/apps/app/ui-tests-app/font/label.ts +++ b/apps/app/ui-tests-app/font/label.ts @@ -1,15 +1,15 @@ -import stack = require("ui/layouts/stack-layout"); -import style = require("ui/styling/style"); -import view = require("ui/core/view"); +import * as stack from "ui/layouts/stack-layout"; +import * as style from "ui/styling/style"; +import * as view from "ui/core/view"; export function resetStyles(args) { var stackLayout = args.object.parent; view.eachDescendant(stackLayout, function (v: view.View) { - v.style._resetValue(style.fontFamilyProperty); - v.style._resetValue(style.fontSizeProperty); - v.style._resetValue(style.fontStyleProperty); - v.style._resetValue(style.fontWeightProperty); - v.style._resetValue(style.colorProperty); - v.style._resetValue(style.textAlignmentProperty); + v.style.fontFamily = unsetValue; + v.style.fontSize = unsetValue; + v.style.fontStyle = unsetValue; + v.style.fontWeight = unsetValue; + v.style.color = unsetValue; + v.style.textAlignment = unsetValue; return true; }); } diff --git a/apps/app/ui-tests-app/font/text-field.ts b/apps/app/ui-tests-app/font/text-field.ts index a76943977..4d79ae00b 100644 --- a/apps/app/ui-tests-app/font/text-field.ts +++ b/apps/app/ui-tests-app/font/text-field.ts @@ -1,15 +1,15 @@ -import stack = require("ui/layouts/stack-layout"); -import style = require("ui/styling/style"); -import view = require("ui/core/view"); +import * as stack from "ui/layouts/stack-layout"; +import * as style from "ui/styling/style"; +import * as view from "ui/core/view"; export function resetStyles(args) { var stackLayout = args.object.parent; view.eachDescendant(stackLayout, function (v: view.View) { - v.style._resetValue(style.fontFamilyProperty); - v.style._resetValue(style.fontSizeProperty); - v.style._resetValue(style.fontStyleProperty); - v.style._resetValue(style.fontWeightProperty); - v.style._resetValue(style.colorProperty); - v.style._resetValue(style.textAlignmentProperty); + v.style.fontFamily = unsetValue; + v.style.fontSize = unsetValue; + v.style.fontStyle = unsetValue; + v.style.fontWeight = unsetValue; + v.style.color = unsetValue; + v.style.textAlignment = unsetValue; return true; }); } diff --git a/apps/app/ui-tests-app/font/text-view.ts b/apps/app/ui-tests-app/font/text-view.ts index a76943977..4d79ae00b 100644 --- a/apps/app/ui-tests-app/font/text-view.ts +++ b/apps/app/ui-tests-app/font/text-view.ts @@ -1,15 +1,15 @@ -import stack = require("ui/layouts/stack-layout"); -import style = require("ui/styling/style"); -import view = require("ui/core/view"); +import * as stack from "ui/layouts/stack-layout"; +import * as style from "ui/styling/style"; +import * as view from "ui/core/view"; export function resetStyles(args) { var stackLayout = args.object.parent; view.eachDescendant(stackLayout, function (v: view.View) { - v.style._resetValue(style.fontFamilyProperty); - v.style._resetValue(style.fontSizeProperty); - v.style._resetValue(style.fontStyleProperty); - v.style._resetValue(style.fontWeightProperty); - v.style._resetValue(style.colorProperty); - v.style._resetValue(style.textAlignmentProperty); + v.style.fontFamily = unsetValue; + v.style.fontSize = unsetValue; + v.style.fontStyle = unsetValue; + v.style.fontWeight = unsetValue; + v.style.color = unsetValue; + v.style.textAlignment = unsetValue; return true; }); } diff --git a/apps/app/ui-tests-app/layouts-percent/absolute.ts b/apps/app/ui-tests-app/layouts-percent/absolute.ts index a5dbb0abf..ee408b2ad 100644 --- a/apps/app/ui-tests-app/layouts-percent/absolute.ts +++ b/apps/app/ui-tests-app/layouts-percent/absolute.ts @@ -1,6 +1,6 @@ -import pageModule = require("ui/page"); -import absoluteLayout = require("ui/layouts/absolute-layout"); -import model = require("./myview"); +import * as pageModule from "ui/page"; +import * as absoluteLayout from "ui/layouts/absolute-layout"; +import * as model from "./myview"; var count = 0; diff --git a/apps/app/ui-tests-app/layouts-percent/dock.ts b/apps/app/ui-tests-app/layouts-percent/dock.ts index 549e7fa63..a30d3d9ee 100644 --- a/apps/app/ui-tests-app/layouts-percent/dock.ts +++ b/apps/app/ui-tests-app/layouts-percent/dock.ts @@ -1,5 +1,5 @@ -import pageModule = require("ui/page"); -import model = require("./myview"); +import * as pageModule from "ui/page"; +import * as model from "./myview"; export function onLoaded(args: { eventName: string, object: any }) { var page = args.object; diff --git a/apps/app/ui-tests-app/layouts-percent/grid.ts b/apps/app/ui-tests-app/layouts-percent/grid.ts index 2086589ea..72ce552a8 100644 --- a/apps/app/ui-tests-app/layouts-percent/grid.ts +++ b/apps/app/ui-tests-app/layouts-percent/grid.ts @@ -1,7 +1,7 @@ -import buttonModule = require("ui/button"); -import pageModule = require("ui/page"); -import gridLayoutModule = require("ui/layouts/grid-layout"); -import model = require("./myview"); +import * as buttonModule from "ui/button"; +import * as pageModule from "ui/page"; +import * as gridLayoutModule from "ui/layouts/grid-layout"; +import * as model from "./myview"; export function onLoaded(args: { eventName: string, object: any }) { var page = args.object; diff --git a/apps/app/ui-tests-app/layouts-percent/myview.ts b/apps/app/ui-tests-app/layouts-percent/myview.ts index 29cf8948e..f639987dc 100644 --- a/apps/app/ui-tests-app/layouts-percent/myview.ts +++ b/apps/app/ui-tests-app/layouts-percent/myview.ts @@ -1,7 +1,7 @@ -import observable = require("data/observable"); -import enums = require("ui/enums"); -import view = require("ui/core/view"); -import layouts = require("ui/layouts/layout-base"); +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"; export class ViewModel extends observable.Observable { diff --git a/apps/app/ui-tests-app/layouts-percent/stack.ts b/apps/app/ui-tests-app/layouts-percent/stack.ts index f6c428d12..c9e5d4d6a 100644 --- a/apps/app/ui-tests-app/layouts-percent/stack.ts +++ b/apps/app/ui-tests-app/layouts-percent/stack.ts @@ -1,6 +1,6 @@ -import enums = require("ui/enums"); -import pageModule = require("ui/page"); -import model = require("./myview"); +import * as enums from "ui/enums"; +import * as pageModule from "ui/page"; +import * as model from "./myview"; export function onLoaded(args: { eventName: string, object: any }) { var page = args.object; diff --git a/apps/app/ui-tests-app/layouts-percent/wrap.ts b/apps/app/ui-tests-app/layouts-percent/wrap.ts index f1a4511d9..a90d8d304 100644 --- a/apps/app/ui-tests-app/layouts-percent/wrap.ts +++ b/apps/app/ui-tests-app/layouts-percent/wrap.ts @@ -1,6 +1,6 @@ -import enums = require("ui/enums"); -import pageModule = require("ui/page"); -import model = require("./myview"); +import * as enums from "ui/enums"; +import * as pageModule from "ui/page"; +import * as model from "./myview"; export function onLoaded(args: { eventName: string, object: any }) { var page = args.object; diff --git a/apps/app/ui-tests-app/layouts/absolute.ts b/apps/app/ui-tests-app/layouts/absolute.ts index 6c867680a..12b951173 100644 --- a/apps/app/ui-tests-app/layouts/absolute.ts +++ b/apps/app/ui-tests-app/layouts/absolute.ts @@ -1,6 +1,6 @@ -import pageModule = require("ui/page"); -import absoluteLayout = require("ui/layouts/absolute-layout"); -import model = require("./myview"); +import * as pageModule from "ui/page"; +import * as absoluteLayout from "ui/layouts/absolute-layout"; +import * as model from "./myview"; var count = 0; diff --git a/apps/app/ui-tests-app/layouts/dock.ts b/apps/app/ui-tests-app/layouts/dock.ts index 549e7fa63..a30d3d9ee 100644 --- a/apps/app/ui-tests-app/layouts/dock.ts +++ b/apps/app/ui-tests-app/layouts/dock.ts @@ -1,5 +1,5 @@ -import pageModule = require("ui/page"); -import model = require("./myview"); +import * as pageModule from "ui/page"; +import * as model from "./myview"; export function onLoaded(args: { eventName: string, object: any }) { var page = args.object; diff --git a/apps/app/ui-tests-app/layouts/grid.ts b/apps/app/ui-tests-app/layouts/grid.ts index 2086589ea..72ce552a8 100644 --- a/apps/app/ui-tests-app/layouts/grid.ts +++ b/apps/app/ui-tests-app/layouts/grid.ts @@ -1,7 +1,7 @@ -import buttonModule = require("ui/button"); -import pageModule = require("ui/page"); -import gridLayoutModule = require("ui/layouts/grid-layout"); -import model = require("./myview"); +import * as buttonModule from "ui/button"; +import * as pageModule from "ui/page"; +import * as gridLayoutModule from "ui/layouts/grid-layout"; +import * as model from "./myview"; export function onLoaded(args: { eventName: string, object: any }) { var page = args.object; diff --git a/apps/app/ui-tests-app/layouts/myview.ts b/apps/app/ui-tests-app/layouts/myview.ts index 9c159f087..5e9912384 100644 --- a/apps/app/ui-tests-app/layouts/myview.ts +++ b/apps/app/ui-tests-app/layouts/myview.ts @@ -1,7 +1,7 @@ -import observable = require("data/observable"); -import enums = require("ui/enums"); -import view = require("ui/core/view"); -import layouts = require("ui/layouts/layout-base"); +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"; export class ViewModel extends observable.Observable { diff --git a/apps/app/ui-tests-app/layouts/stack.ts b/apps/app/ui-tests-app/layouts/stack.ts index f6c428d12..c9e5d4d6a 100644 --- a/apps/app/ui-tests-app/layouts/stack.ts +++ b/apps/app/ui-tests-app/layouts/stack.ts @@ -1,6 +1,6 @@ -import enums = require("ui/enums"); -import pageModule = require("ui/page"); -import model = require("./myview"); +import * as enums from "ui/enums"; +import * as pageModule from "ui/page"; +import * as model from "./myview"; export function onLoaded(args: { eventName: string, object: any }) { var page = args.object; diff --git a/apps/app/ui-tests-app/layouts/wrap.ts b/apps/app/ui-tests-app/layouts/wrap.ts index 562fe24e1..afa0bd0e5 100644 --- a/apps/app/ui-tests-app/layouts/wrap.ts +++ b/apps/app/ui-tests-app/layouts/wrap.ts @@ -1,6 +1,6 @@ -import enums = require("ui/enums"); -import pageModule = require("ui/page"); -import model = require("./myview"); +import * as enums from "ui/enums"; +import * as pageModule from "ui/page"; +import * as model from "./myview"; export function onLoaded(args: { eventName: string, object: any }) { var page = args.object; diff --git a/apps/app/ui-tests-app/mainPage.ts b/apps/app/ui-tests-app/mainPage.ts index 8affc98bf..ca048dfc0 100644 --- a/apps/app/ui-tests-app/mainPage.ts +++ b/apps/app/ui-tests-app/mainPage.ts @@ -1,12 +1,12 @@ import { EventData } from "data/observable"; import { Page } from "ui/page"; -import buttonModule = require("ui/button"); -import colorModule = require("color"); +import * as buttonModule from "ui/button"; +import * as colorModule from "color"; import * as platform from "platform"; -import frame = require("ui/frame"); -import trace = require("trace"); -import observable = require("data/observable"); -import dialogs = require("ui/dialogs"); +import * as frame from "ui/frame"; +import * as trace from "trace"; +import * as observable from "data/observable"; +import * as dialogs from "ui/dialogs"; import { WrapLayout } from "ui/layouts/wrap-layout"; var examples: Map = new Map(); diff --git a/apps/app/ui-tests-app/modal-view/login-page.ts b/apps/app/ui-tests-app/modal-view/login-page.ts index a4bd28fc3..64b016a8e 100644 --- a/apps/app/ui-tests-app/modal-view/login-page.ts +++ b/apps/app/ui-tests-app/modal-view/login-page.ts @@ -1,6 +1,6 @@ -import pages = require("ui/page"); -import textField = require("ui/text-field"); -import observable = require("data/observable"); +import * as pages from "ui/page"; +import * as textField from "ui/text-field"; +import * as observable from "data/observable"; var context: any; var closeCallback: Function; diff --git a/apps/app/ui-tests-app/modal-view/modal-view.ts b/apps/app/ui-tests-app/modal-view/modal-view.ts index a8fa8741b..0b120fde8 100644 --- a/apps/app/ui-tests-app/modal-view/modal-view.ts +++ b/apps/app/ui-tests-app/modal-view/modal-view.ts @@ -1,6 +1,6 @@ -import pages = require("ui/page"); -import labelModule = require("ui/label"); -import observable = require("data/observable"); +import * as pages from "ui/page"; +import * as labelModule from "ui/label"; +import * as observable from "data/observable"; var page: pages.Page; var label: labelModule.Label; diff --git a/apps/app/ui-tests-app/page/page-status-bar-css.ts b/apps/app/ui-tests-app/page/page-status-bar-css.ts index 6cafc2a69..6ccb4a1a3 100644 --- a/apps/app/ui-tests-app/page/page-status-bar-css.ts +++ b/apps/app/ui-tests-app/page/page-status-bar-css.ts @@ -1,7 +1,7 @@ -import color = require("color"); -import page = require("ui/page"); -import style = require("ui/styling/style"); -import view = require("ui/core/view"); +import * as color from "color"; +import * as page from "ui/page"; +import * as style from "ui/styling/style"; +import * as view from "ui/core/view"; export function applyTap(args) { let page = (args.object).page; @@ -68,5 +68,5 @@ function reset(page: page.Page) { page.css = ""; page.actionBarHidden = false; page.backgroundSpanUnderStatusBar = false; - page.actionBar.style._resetValue(style.backgroundColorProperty); + page.actionBar.style.backgroundColor = unsetValue; } \ No newline at end of file diff --git a/apps/app/ui-tests-app/pages/console.ts b/apps/app/ui-tests-app/pages/console.ts index c06c76ea7..05aecdb72 100644 --- a/apps/app/ui-tests-app/pages/console.ts +++ b/apps/app/ui-tests-app/pages/console.ts @@ -1,9 +1,9 @@ -import app = require("application"); -import pageModule = require("ui/page"); -import labelModule = require("ui/label"); -import stackLayoutModule = require("ui/layouts/stack-layout"); -import textViewModule = require("ui/text-view"); -import buttonModule = require("ui/button"); +import * as app from "application"; +import * as pageModule from "ui/page"; +import * as labelModule from "ui/label"; +import * as stackLayoutModule from "ui/layouts/stack-layout"; +import * as textViewModule from "ui/text-view"; +import * as buttonModule from "ui/button"; export function createPage() { diff --git a/apps/app/ui-tests-app/pages/gestures.ts b/apps/app/ui-tests-app/pages/gestures.ts index d89288440..cdc9593ac 100644 --- a/apps/app/ui-tests-app/pages/gestures.ts +++ b/apps/app/ui-tests-app/pages/gestures.ts @@ -1,9 +1,9 @@ -import labelModule = require("ui/label"); -import gestures = require("ui/gestures"); -import button = require("ui/button"); -import pages = require("ui/page"); -import deviceProperties = require("platform"); -import stackLayoutModule = require("ui/layouts/stack-layout"); +import * as labelModule from "ui/label"; +import * as gestures from "ui/gestures"; +import * as button from "ui/button"; +import * as pages from "ui/page"; +import * as deviceProperties from "platform"; +import * as stackLayoutModule from "ui/layouts/stack-layout"; export function createPage() { diff --git a/apps/app/ui-tests-app/pages/handlers.ts b/apps/app/ui-tests-app/pages/handlers.ts index 1b537c0a2..e41d0613b 100644 --- a/apps/app/ui-tests-app/pages/handlers.ts +++ b/apps/app/ui-tests-app/pages/handlers.ts @@ -1,6 +1,6 @@ -import observable = require("data/observable"); -import gestures = require("ui/gestures"); -import pages = require("ui/page"); +import * as observable from "data/observable"; +import * as gestures from "ui/gestures"; +import * as pages from "ui/page"; export function pageLoaded(args: observable.EventData) { var page = args.object; diff --git a/apps/app/ui-tests-app/pages/i61.ts b/apps/app/ui-tests-app/pages/i61.ts index 978c1e8f9..312eb8405 100644 --- a/apps/app/ui-tests-app/pages/i61.ts +++ b/apps/app/ui-tests-app/pages/i61.ts @@ -1,6 +1,6 @@ -import pages = require("ui/page"); -import button = require("ui/button"); -import panelModule = require("ui/layouts/stack-layout"); +import * as pages from "ui/page"; +import * as button from "ui/button"; +import * as panelModule from "ui/layouts/stack-layout"; export function createPage() { diff --git a/apps/app/ui-tests-app/pages/i73.ts b/apps/app/ui-tests-app/pages/i73.ts index 19a4647f7..da64267c6 100644 --- a/apps/app/ui-tests-app/pages/i73.ts +++ b/apps/app/ui-tests-app/pages/i73.ts @@ -1,6 +1,6 @@ -import pages = require("ui/page"); -import button = require("ui/button"); -import stackModule = require("ui/layouts/stack-layout"); +import * as pages from "ui/page"; +import * as button from "ui/button"; +import * as stackModule from "ui/layouts/stack-layout"; export function createPage() { diff --git a/apps/app/ui-tests-app/pages/listview_binding.ts b/apps/app/ui-tests-app/pages/listview_binding.ts index 7a2f9ad0f..0234669f8 100644 --- a/apps/app/ui-tests-app/pages/listview_binding.ts +++ b/apps/app/ui-tests-app/pages/listview_binding.ts @@ -1,8 +1,8 @@ -import pageModule = require("ui/page"); -import gridLayoutModule = require("ui/layouts/grid-layout"); -import listViewModule = require("ui/list-view"); -import observable = require("data/observable"); -import observableArr = require("data/observable-array"); +import * as pageModule from "ui/page"; +import * as gridLayoutModule from "ui/layouts/grid-layout"; +import * as listViewModule from "ui/list-view"; +import * as observable from "data/observable"; +import * as observableArr from "data/observable-array"; var arr = new observableArr.ObservableArray(); for (var i = 0; i < 100; i++) { diff --git a/apps/app/ui-tests-app/pages/touch-event.ts b/apps/app/ui-tests-app/pages/touch-event.ts index d54ddfbed..5e15c5fda 100644 --- a/apps/app/ui-tests-app/pages/touch-event.ts +++ b/apps/app/ui-tests-app/pages/touch-event.ts @@ -1,5 +1,5 @@ import {TextView} from "ui/text-view"; -import gestures = require("ui/gestures"); +import * as gestures from "ui/gestures"; export function onTouch(args: gestures.TouchGestureEventData) { var msg = " touch action: " + args.action + diff --git a/apps/app/ui-tests-app/segmented-bar/all.ts b/apps/app/ui-tests-app/segmented-bar/all.ts index b0d888554..ea2116616 100644 --- a/apps/app/ui-tests-app/segmented-bar/all.ts +++ b/apps/app/ui-tests-app/segmented-bar/all.ts @@ -1,4 +1,4 @@ -import frame = require("ui/frame"); +import * as frame from "ui/frame"; export function navigate(args) { frame.topmost().navigate("ui-tests-app/segmented-bar/clean"); diff --git a/apps/app/ui-tests-app/segmented-bar/clean.ts b/apps/app/ui-tests-app/segmented-bar/clean.ts index 7837f595e..1d9c2b291 100644 --- a/apps/app/ui-tests-app/segmented-bar/clean.ts +++ b/apps/app/ui-tests-app/segmented-bar/clean.ts @@ -1,4 +1,4 @@ -import frame = require("ui/frame"); +import * as frame from "ui/frame"; export function navigate(args) { frame.topmost().goBack(); diff --git a/apps/app/ui-tests-app/tab-view/tab-view-css.ts b/apps/app/ui-tests-app/tab-view/tab-view-css.ts index 5de5cf1a8..237155bc6 100644 --- a/apps/app/ui-tests-app/tab-view/tab-view-css.ts +++ b/apps/app/ui-tests-app/tab-view/tab-view-css.ts @@ -1,5 +1,5 @@ -import view = require("ui/core/view"); -import pages = require("ui/page"); +import * as view from "ui/core/view"; +import * as pages from "ui/page"; export function applyTap(args) { var page = (args.object).page; diff --git a/apps/app/ui-tests-app/text-field/text-field.ts b/apps/app/ui-tests-app/text-field/text-field.ts index df32dc2f8..2794eb954 100644 --- a/apps/app/ui-tests-app/text-field/text-field.ts +++ b/apps/app/ui-tests-app/text-field/text-field.ts @@ -1,4 +1,4 @@ -import observable = require("data/observable"); +import * as observable from "data/observable"; export function pageLoaded(args) { var page = args.object; diff --git a/apps/app/ui-tests-app/transitions/page0.ts b/apps/app/ui-tests-app/transitions/page0.ts index b0daaafcd..370a54b4b 100644 --- a/apps/app/ui-tests-app/transitions/page0.ts +++ b/apps/app/ui-tests-app/transitions/page0.ts @@ -1,4 +1,4 @@ -import frame = require("ui/frame"); +import * as frame from "ui/frame"; export function onTap(args) { var navigationEntry = { diff --git a/apps/app/ui-tests-app/transitions/page1.ts b/apps/app/ui-tests-app/transitions/page1.ts index 6f6e76645..6c2059053 100644 --- a/apps/app/ui-tests-app/transitions/page1.ts +++ b/apps/app/ui-tests-app/transitions/page1.ts @@ -1,4 +1,4 @@ -import frame = require("ui/frame"); +import * as frame from "ui/frame"; export function onTap(args) { var navigationEntry = { diff --git a/tests/app/TKUnit.ts b/tests/app/TKUnit.ts index c71b3b0a4..1c8b3e04f 100644 --- a/tests/app/TKUnit.ts +++ b/tests/app/TKUnit.ts @@ -10,11 +10,11 @@ */ -import Application = require("application"); -import timer = require("timer"); -import trace = require("trace"); -import types = require("utils/types"); -import platform = require("platform"); +import * as Application from "application"; +import * as timer from "timer"; +import * as trace from "trace"; +import * as types from "utils/types"; +import * as platform from "platform"; import * as utils from "utils/utils"; diff --git a/tests/app/app/app.ts b/tests/app/app/app.ts index d0eb61759..5ac7f07c2 100644 --- a/tests/app/app/app.ts +++ b/tests/app/app/app.ts @@ -6,7 +6,7 @@ else { start = java.lang.System.currentTimeMillis(); } -import application = require("application"); +import * as application from "application"; // Specify custom UIApplicationDelegate. /* diff --git a/tests/app/app/location-example.ts b/tests/app/app/location-example.ts index 482a5e81d..5cbd92b5e 100644 --- a/tests/app/app/location-example.ts +++ b/tests/app/app/location-example.ts @@ -1,10 +1,10 @@ -import pages = require("ui/page"); -import locationModule = require("location"); -import dialogsModule = require("ui/dialogs"); -import platformModule = require("platform"); -import textViewModule = require("ui/text-view"); -import observable = require("data/observable"); -import appModule = require("application"); +import * as pages from "ui/page"; +import * as locationModule from "location"; +import * as dialogsModule from "ui/dialogs"; +import * as platformModule from "platform"; +import * as textViewModule from "ui/text-view"; +import * as observable from "data/observable"; +import * as appModule from "application"; var locationManager = new locationModule.LocationManager(); diff --git a/tests/app/app/mainPage.ts b/tests/app/app/mainPage.ts index 586dbe66f..38ac8fe13 100644 --- a/tests/app/app/mainPage.ts +++ b/tests/app/app/mainPage.ts @@ -1,6 +1,6 @@ import {Page} from "ui/page"; import * as trace from "trace"; -import tests = require("../testRunner"); +import * as tests from "../testRunner"; import {Label} from "ui/label"; import * as application from "application"; import * as platform from "platform"; diff --git a/tests/app/app/pageNavigation.ts b/tests/app/app/pageNavigation.ts index 33d42c5d8..014550d29 100644 --- a/tests/app/app/pageNavigation.ts +++ b/tests/app/app/pageNavigation.ts @@ -1,7 +1,7 @@ -import frame = require("ui/frame"); -import pages = require("ui/page"); -import buttonModule = require("ui/button"); -import tabViewModule = require("ui/tab-view"); +import * as frame from "ui/frame"; +import * as pages from "ui/page"; +import * as buttonModule from "ui/button"; +import * as tabViewModule from "ui/tab-view"; export function createPage() { var tab = new tabViewModule.TabView(); diff --git a/tests/app/app/style_props.ts b/tests/app/app/style_props.ts index 5b55e8fc3..419d5063f 100644 --- a/tests/app/app/style_props.ts +++ b/tests/app/app/style_props.ts @@ -1,10 +1,10 @@ -import style = require("ui/styling/style"); +import * as style from "ui/styling/style"; import {PropertyMetadata, PropertyMetadataSettings} from "ui/core/dependency-observable"; -import styleProperty = require("ui/styling/style-property"); -import view = require("ui/core/view"); -import buttonModule = require("ui/button"); -import pages = require("ui/page"); -import stackLayoutDef = require("ui/layouts/stack-layout"); +import * as styleProperty from "ui/styling/style-property"; +import * as view from "ui/core/view"; +import * as buttonModule from "ui/button"; +import * as pages from "ui/page"; +import * as stackLayoutDef from "ui/layouts/stack-layout"; import {isAndroid} from "platform"; // on Android we explicitly set propertySettings to None because android will invalidate its layout (skip unnecessary native call). diff --git a/tests/app/app/testPage.ts b/tests/app/app/testPage.ts index 5247b38e7..84cb9c6f1 100644 --- a/tests/app/app/testPage.ts +++ b/tests/app/app/testPage.ts @@ -1,4 +1,4 @@ -import frame = require("ui/frame"); +import * as frame from "ui/frame"; export function buttonTap(args) { frame.topmost().goBack(); diff --git a/tests/app/app/testRunnerPage.ts b/tests/app/app/testRunnerPage.ts index 1ba7d4e97..37dd9e69b 100644 --- a/tests/app/app/testRunnerPage.ts +++ b/tests/app/app/testRunnerPage.ts @@ -1,8 +1,8 @@ -import tests = require("../testRunner"); -import pages = require("ui/page"); -import bm = require("ui/button"); -import listViewDef = require("ui/list-view"); -import trace = require("trace"); +import * as tests from "../testRunner"; +import * as pages from "ui/page"; +import * as bm from "ui/button"; +import * as listViewDef from "ui/list-view"; +import * as trace from "trace"; trace.enable(); trace.addCategories(trace.categories.Test + "," + trace.categories.Error); diff --git a/tests/app/application-tests-common.ts b/tests/app/application-tests-common.ts index 371819a58..4d02b4b30 100644 --- a/tests/app/application-tests-common.ts +++ b/tests/app/application-tests-common.ts @@ -1,6 +1,6 @@ // >> application-require -import app = require("application"); -import platform = require("platform"); +import * as app from "application"; +import * as platform from "platform"; // << application-require // >> application-app-check @@ -11,7 +11,7 @@ if (app.android) { } // << application-app-check -import TKUnit = require("./TKUnit"); +import * as TKUnit from "./TKUnit"; export var testInitialized = function () { if (platform.device.os === platform.platformNames.android) { diff --git a/tests/app/application-tests.android.ts b/tests/app/application-tests.android.ts index 143ffe7b9..900f9106d 100644 --- a/tests/app/application-tests.android.ts +++ b/tests/app/application-tests.android.ts @@ -1,7 +1,7 @@ /* tslint:disable:no-unused-variable */ -import app = require("application"); -import TKUnit = require("./TKUnit"); -import commonTests = require("./application-tests-common"); +import * as app from "application"; +import * as TKUnit from "./TKUnit"; +import * as commonTests from "./application-tests-common"; global.moduleMerge(commonTests, exports); diff --git a/tests/app/application-tests.ios.ts b/tests/app/application-tests.ios.ts index bce3bd5d4..35d8487ce 100644 --- a/tests/app/application-tests.ios.ts +++ b/tests/app/application-tests.ios.ts @@ -1,7 +1,7 @@ /* tslint:disable:no-unused-variable */ -import app = require("application"); -import TKUnit = require("./TKUnit"); -import commonTests = require("./application-tests-common"); +import * as app from "application"; +import * as TKUnit from "./TKUnit"; +import * as commonTests from "./application-tests-common"; import * as utils from "utils/utils"; import getter = utils.ios.getter; diff --git a/tests/app/camera-tests.ts b/tests/app/camera-tests.ts index 5db6109e7..fbd60f12f 100644 --- a/tests/app/camera-tests.ts +++ b/tests/app/camera-tests.ts @@ -1,8 +1,8 @@ // >> camera-require -import camera = require("camera"); +import * as camera from "camera"; // << camera-require -import TKUnit = require("./TKUnit"); +import * as TKUnit from "./TKUnit"; export var test_takePicture = function () { // >> camera-take-picture diff --git a/tests/app/color-tests.ts b/tests/app/color-tests.ts index b3a5524d3..cb05709d0 100644 --- a/tests/app/color-tests.ts +++ b/tests/app/color-tests.ts @@ -1,8 +1,8 @@ // >> color-require -import colorModule = require("color"); +import * as colorModule from "color"; var Color = colorModule.Color; // << color-require -import TKUnit = require("./TKUnit"); +import * as TKUnit from "./TKUnit"; export var test_Hex_Color = function () { // >> color-hex diff --git a/tests/app/connectivity-tests.ts b/tests/app/connectivity-tests.ts index 623a31a53..ba99d8e3c 100644 --- a/tests/app/connectivity-tests.ts +++ b/tests/app/connectivity-tests.ts @@ -1,5 +1,5 @@ // >> connectivity-require -import connectivity = require("connectivity"); +import * as connectivity from "connectivity"; // << connectivity-require export var test_DummyTestForSnippetOnly0 = function () { diff --git a/tests/app/data/observable-array-tests.ts b/tests/app/data/observable-array-tests.ts index fc53e8364..75ba023b7 100644 --- a/tests/app/data/observable-array-tests.ts +++ b/tests/app/data/observable-array-tests.ts @@ -1,9 +1,9 @@ -import TKUnit = require("../TKUnit"); -import bindableModule = require("ui/core/bindable"); +import * as TKUnit from "../TKUnit"; +import * as bindableModule from "ui/core/bindable"; require("globals"); // >> observable-array-require -import observableArrayModule = require("data/observable-array"); +import * as observableArrayModule from "data/observable-array"; // << observable-array-require require("globals"); diff --git a/tests/app/data/observable-tests.ts b/tests/app/data/observable-tests.ts index 60238f943..3b9ed7dc0 100644 --- a/tests/app/data/observable-tests.ts +++ b/tests/app/data/observable-tests.ts @@ -1,11 +1,11 @@ // >> observable-require -import observable = require("data/observable"); +import * as observable from "data/observable"; // << observable-require -import dependencyObservable = require("ui/core/dependency-observable"); -import TKUnit = require("../TKUnit"); -import types = require("utils/types"); -import proxy = require("ui/core/proxy"); +import * as dependencyObservable from "ui/core/dependency-observable"; +import * as TKUnit from "../TKUnit"; +import * as types from "utils/types"; +import * as proxy from "ui/core/proxy"; import {ObservableArray} from "data/observable-array"; var TESTED_NAME = "tested"; diff --git a/tests/app/data/virtual-array-tests.ts b/tests/app/data/virtual-array-tests.ts index 6e4e28230..6a514c3ad 100644 --- a/tests/app/data/virtual-array-tests.ts +++ b/tests/app/data/virtual-array-tests.ts @@ -1,8 +1,8 @@ -import TKUnit = require("../TKUnit"); -import types = require("utils/types"); +import * as TKUnit from "../TKUnit"; +import * as types from "utils/types"; // >> virtual-array-require -import virtualArrayModule = require("data/virtual-array"); +import * as virtualArrayModule from "data/virtual-array"; // << virtual-array-require require("globals"); diff --git a/tests/app/fetch-tests.ts b/tests/app/fetch-tests.ts index 98ceb0861..bf4d3d75f 100644 --- a/tests/app/fetch-tests.ts +++ b/tests/app/fetch-tests.ts @@ -1,6 +1,6 @@ /* tslint:disable:no-unused-variable */ -import TKUnit = require("./TKUnit"); -import types = require("utils/types"); +import * as TKUnit from "./TKUnit"; +import * as types from "utils/types"; export var test_fetch_defined = function () { TKUnit.assert(types.isDefined((fetch)), "Method fetch() should be defined!"); diff --git a/tests/app/file-name-resolver-tests/file-name-resolver-tests.ts b/tests/app/file-name-resolver-tests/file-name-resolver-tests.ts index 26c59637d..ed400faf2 100644 --- a/tests/app/file-name-resolver-tests/file-name-resolver-tests.ts +++ b/tests/app/file-name-resolver-tests/file-name-resolver-tests.ts @@ -1,7 +1,7 @@ -import TKUnit = require("../TKUnit"); -import fs = require("file-system"); -import enums = require("ui/enums"); -import resolver = require("file-system/file-name-resolver"); +import * as TKUnit from "../TKUnit"; +import * as fs from "file-system"; +import * as enums from "ui/enums"; +import * as resolver from "file-system/file-name-resolver"; var androidPhonePortraitContext: resolver.PlatformContext = { width: 360, diff --git a/tests/app/file-system-access-tests/file-system-access-tests.ts b/tests/app/file-system-access-tests/file-system-access-tests.ts index 077be87a8..cda0ca56e 100644 --- a/tests/app/file-system-access-tests/file-system-access-tests.ts +++ b/tests/app/file-system-access-tests/file-system-access-tests.ts @@ -1,5 +1,5 @@ -import TKUnit = require("../TKUnit"); -import fs = require("file-system"); +import * as TKUnit from "../TKUnit"; +import * as fs from "file-system"; export var test_UTF8_BOM_is_not_returned = function () { var actualResult: string; diff --git a/tests/app/file-system-tests.ts b/tests/app/file-system-tests.ts index 94d0636bc..1f20510b4 100644 --- a/tests/app/file-system-tests.ts +++ b/tests/app/file-system-tests.ts @@ -1,11 +1,11 @@ /* tslint:disable:no-unused-variable */ // >> file-system-require -import fs = require("file-system"); +import * as fs from "file-system"; // << file-system-require -import TKUnit = require("./TKUnit"); -import appModule = require("application"); -import platform = require("platform"); +import * as TKUnit from "./TKUnit"; +import * as appModule from "application"; +import * as platform from "platform"; export var testPathNormalize = function () { // >> file-system-normalize diff --git a/tests/app/fps-meter-tests.ts b/tests/app/fps-meter-tests.ts index 85a328252..bdb92141d 100644 --- a/tests/app/fps-meter-tests.ts +++ b/tests/app/fps-meter-tests.ts @@ -1,5 +1,5 @@ // >> fps-meter-require -import fpsMeter = require("fps-meter"); +import * as fpsMeter from "fps-meter"; // << fps-meter-require export var test_DummyTestForSnippetOnly0 = function () { diff --git a/tests/app/http-tests.ts b/tests/app/http-tests.ts index a649c62be..7f4136abd 100644 --- a/tests/app/http-tests.ts +++ b/tests/app/http-tests.ts @@ -1,8 +1,8 @@ /* tslint:disable:no-unused-variable */ -import TKUnit = require("./TKUnit"); -import http = require("http"); -import types = require("utils/types"); -import fs = require("file-system"); +import * as TKUnit from "./TKUnit"; +import * as http from "http"; +import * as types from "utils/types"; +import * as fs from "file-system"; require("globals"); // >> http-require diff --git a/tests/app/image-source-tests.ts b/tests/app/image-source-tests.ts index fed8c82b8..b3b8c0c13 100644 --- a/tests/app/image-source-tests.ts +++ b/tests/app/image-source-tests.ts @@ -6,12 +6,12 @@ // var fs = require("file-system"); // << imagesource-require-alt -import imageSource = require("image-source"); -import fs = require("file-system"); -import enums = require("ui/enums"); -import app = require("application"); -import TKUnit = require("./TKUnit"); -import platform = require("platform"); +import * as imageSource from "image-source"; +import * as fs from "file-system"; +import * as enums from "ui/enums"; +import * as app from "application"; +import * as TKUnit from "./TKUnit"; +import * as platform from "platform"; var imagePath = fs.path.join(__dirname, "/logo.png"); var smallImagePath = fs.path.join(__dirname, "/small-image.png"); diff --git a/tests/app/navigation/custom-transition.android.ts b/tests/app/navigation/custom-transition.android.ts index b9eefe90e..579b01cc0 100644 --- a/tests/app/navigation/custom-transition.android.ts +++ b/tests/app/navigation/custom-transition.android.ts @@ -1,4 +1,4 @@ -import transition = require("ui/transition"); +import * as transition from "ui/transition"; export class CustomTransition extends transition.Transition { constructor(duration: number, curve: any) { diff --git a/tests/app/navigation/custom-transition.ios.ts b/tests/app/navigation/custom-transition.ios.ts index 2f00a4b1f..d4d038ac2 100644 --- a/tests/app/navigation/custom-transition.ios.ts +++ b/tests/app/navigation/custom-transition.ios.ts @@ -1,4 +1,4 @@ -import transition = require("ui/transition"); +import * as transition from "ui/transition"; export class CustomTransition extends transition.Transition { constructor(duration: number, curve: any) { diff --git a/tests/app/navigation/navigation-tests.ts b/tests/app/navigation/navigation-tests.ts index f55b1ad88..429de2682 100644 --- a/tests/app/navigation/navigation-tests.ts +++ b/tests/app/navigation/navigation-tests.ts @@ -2,7 +2,7 @@ import {Page, NavigatedData} from "ui/page"; import {topmost as topmostFrame, NavigationTransition} from "ui/frame"; import {Color} from "color"; -import helper = require("../ui/helper"); +import * as helper from "../ui/helper"; // Creates a random colorful page full of meaningless stuff. let id = 0; diff --git a/tests/app/pages/app.ts b/tests/app/pages/app.ts index da21537c4..4d810e236 100644 --- a/tests/app/pages/app.ts +++ b/tests/app/pages/app.ts @@ -1,2 +1,2 @@ -import application = require("application"); +import * as application from "application"; application.start({ moduleName: "pages/page14" }); \ No newline at end of file diff --git a/tests/app/pages/background-test.ts b/tests/app/pages/background-test.ts index daa8289fc..356dbcb5c 100644 --- a/tests/app/pages/background-test.ts +++ b/tests/app/pages/background-test.ts @@ -1,5 +1,5 @@ -import view = require("ui/core/view"); -import pages = require("ui/page"); +import * as view from "ui/core/view"; +import * as pages from "ui/page"; export function applyTap(args) { var page = (args.object).page; diff --git a/tests/app/pages/file-load-test.ts b/tests/app/pages/file-load-test.ts index f91f61121..816588955 100644 --- a/tests/app/pages/file-load-test.ts +++ b/tests/app/pages/file-load-test.ts @@ -1,7 +1,7 @@ -import label = require("ui/label"); -import pages = require("ui/page"); -import fs = require("file-system"); -import fileResolverModule = require("file-system/file-name-resolver"); +import * as label from "ui/label"; +import * as pages from "ui/page"; +import * as fs from "file-system"; +import * as fileResolverModule from "file-system/file-name-resolver"; export function createPage() { var page = new pages.Page(); diff --git a/tests/app/pages/fonts-test.ts b/tests/app/pages/fonts-test.ts index 14d5ba0ba..756a394af 100644 --- a/tests/app/pages/fonts-test.ts +++ b/tests/app/pages/fonts-test.ts @@ -1,17 +1,17 @@ -import stack = require("ui/layouts/stack-layout"); -import style = require("ui/styling/style"); +import * as stack from "ui/layouts/stack-layout"; +import * as style from "ui/styling/style"; export function buttonTap(args) { var stackLayout = args.object.parent; for (var i = 0; i < stackLayout.getChildrenCount(); i++){ var v = stackLayout.getChildAt(i); - v.style._resetValue(style.fontFamilyProperty); - v.style._resetValue(style.fontSizeProperty); - v.style._resetValue(style.fontStyleProperty); - v.style._resetValue(style.fontWeightProperty); + v.style.fontFamily = unsetValue; + v.style.fontSize = unsetValue; + v.style.fontStyle = unsetValue; + v.style.fontWeight = unsetValue; - v.style._resetValue(style.colorProperty); - v.style._resetValue(style.textAlignmentProperty); + v.style.color = unsetValue; + v.style.textAlignment = unsetValue; } } diff --git a/tests/app/pages/navigation/pageA-new-activity.ts b/tests/app/pages/navigation/pageA-new-activity.ts index dc8e42d6a..b4986c530 100644 --- a/tests/app/pages/navigation/pageA-new-activity.ts +++ b/tests/app/pages/navigation/pageA-new-activity.ts @@ -1,8 +1,8 @@ -import pages = require("ui/page"); -import frame = require("ui/frame"); -import stackModule = require("ui/layouts/stack-layout"); -import button = require("ui/button"); -import text = require("ui/text-field"); +import * as pages from "ui/page"; +import * as frame from "ui/frame"; +import * as stackModule from "ui/layouts/stack-layout"; +import * as button from "ui/button"; +import * as text from "ui/text-field"; export function createPage() { var page = new pages.Page(); diff --git a/tests/app/pages/navigation/pageA.ts b/tests/app/pages/navigation/pageA.ts index 7beb7edd1..b731e0f4e 100644 --- a/tests/app/pages/navigation/pageA.ts +++ b/tests/app/pages/navigation/pageA.ts @@ -1,10 +1,10 @@ -import pages = require("ui/page"); -import frame = require("ui/frame"); -import stackModule = require("ui/layouts/stack-layout"); -import button = require("ui/button"); -import text = require("ui/text-field"); -import color = require("color"); -import list = require("ui/list-view"); +import * as pages from "ui/page"; +import * as frame from "ui/frame"; +import * as stackModule from "ui/layouts/stack-layout"; +import * as button from "ui/button"; +import * as text from "ui/text-field"; +import * as color from "color"; +import * as list from "ui/list-view"; //// Enable page caching //frame.topmost().android.cachePagesOnNavigate = true; diff --git a/tests/app/pages/navigation/pageB-new-activity.ts b/tests/app/pages/navigation/pageB-new-activity.ts index 99d8bc318..5a3655f62 100644 --- a/tests/app/pages/navigation/pageB-new-activity.ts +++ b/tests/app/pages/navigation/pageB-new-activity.ts @@ -1,8 +1,8 @@ -import pages = require("ui/page"); -import frame = require("ui/frame"); -import stackModule = require("ui/layouts/stack-layout"); -import button = require("ui/button"); -import text = require("ui/text-field"); +import * as pages from "ui/page"; +import * as frame from "ui/frame"; +import * as stackModule from "ui/layouts/stack-layout"; +import * as button from "ui/button"; +import * as text from "ui/text-field"; export function createPage() { var page = new pages.Page(); diff --git a/tests/app/pages/navigation/pageB.ts b/tests/app/pages/navigation/pageB.ts index d9af436c5..06958304b 100644 --- a/tests/app/pages/navigation/pageB.ts +++ b/tests/app/pages/navigation/pageB.ts @@ -1,10 +1,10 @@ -import pages = require("ui/page"); -import frame = require("ui/frame"); -import stackModule = require("ui/layouts/stack-layout"); -import button = require("ui/button"); -import text = require("ui/text-field"); -import color = require("color"); -import scroll = require("ui/scroll-view"); +import * as pages from "ui/page"; +import * as frame from "ui/frame"; +import * as stackModule from "ui/layouts/stack-layout"; +import * as button from "ui/button"; +import * as text from "ui/text-field"; +import * as color from "color"; +import * as scroll from "ui/scroll-view"; export function createPage() { var page = new pages.Page(); diff --git a/tests/app/pages/navigation/pageC-new-activity.ts b/tests/app/pages/navigation/pageC-new-activity.ts index a64604b55..c8a93a9d8 100644 --- a/tests/app/pages/navigation/pageC-new-activity.ts +++ b/tests/app/pages/navigation/pageC-new-activity.ts @@ -1,8 +1,8 @@ -import pages = require("ui/page"); -import frame = require("ui/frame"); -import stackModule = require("ui/layouts/stack-layout"); -import button = require("ui/button"); -import text = require("ui/text-field"); +import * as pages from "ui/page"; +import * as frame from "ui/frame"; +import * as stackModule from "ui/layouts/stack-layout"; +import * as button from "ui/button"; +import * as text from "ui/text-field"; export function createPage() { var page = new pages.Page(); diff --git a/tests/app/pages/navigation/pageC.ts b/tests/app/pages/navigation/pageC.ts index 76f331d1c..8a6edcd7c 100644 --- a/tests/app/pages/navigation/pageC.ts +++ b/tests/app/pages/navigation/pageC.ts @@ -1,8 +1,8 @@ -import pages = require("ui/page"); -import frame = require("ui/frame"); -import stackModule = require("ui/layouts/stack-layout"); -import button = require("ui/button"); -import text = require("ui/text-field"); +import * as pages from "ui/page"; +import * as frame from "ui/frame"; +import * as stackModule from "ui/layouts/stack-layout"; +import * as button from "ui/button"; +import * as text from "ui/text-field"; export function createPage() { var page = new pages.Page(); diff --git a/tests/app/pages/page10.ts b/tests/app/pages/page10.ts index f5b2be08a..be287356f 100644 --- a/tests/app/pages/page10.ts +++ b/tests/app/pages/page10.ts @@ -1,7 +1,7 @@ -import pages = require("ui/page"); -import imageSource = require("image-source"); -import gridModule = require("ui/layouts/grid-layout"); -import enums = require("ui/enums"); +import * as pages from "ui/page"; +import * as imageSource from "image-source"; +import * as gridModule from "ui/layouts/grid-layout"; +import * as enums from "ui/enums"; export function createPage() { var StackLayout = require("ui/layouts/stack-layout").StackLayout; @@ -12,10 +12,10 @@ export function createPage() { var grid = new gridModule.GridLayout(); stack.addChild(grid); - grid.addColumn(new gridModule.ItemSpec(80, gridModule.GridUnitType.pixel)); - grid.addColumn(new gridModule.ItemSpec(1, gridModule.GridUnitType.star)); - grid.addRow(new gridModule.ItemSpec(1, gridModule.GridUnitType.auto)); - grid.addRow(new gridModule.ItemSpec(1, gridModule.GridUnitType.auto)); + grid.addColumn(new gridModule.ItemSpec(80, "pixel")); + grid.addColumn(new gridModule.ItemSpec(1, "star")); + grid.addRow(new gridModule.ItemSpec(1, "auto")); + grid.addRow(new gridModule.ItemSpec(1, "auto")); var defaultImageSource = imageSource.fromFile(__dirname + "/test.png"); diff --git a/tests/app/pages/page11.ts b/tests/app/pages/page11.ts index 2ede06fda..84d01f50b 100644 --- a/tests/app/pages/page11.ts +++ b/tests/app/pages/page11.ts @@ -1,13 +1,13 @@ -import p = require("ui/page"); -import gridModule = require("ui/layouts/grid-layout"); -import sp = require("ui/layouts/stack-layout"); -import button = require("ui/button"); -import enums = require("ui/enums"); +import * as p from "ui/page"; +import * as gridModule from "ui/layouts/grid-layout"; +import * as sp from "ui/layouts/stack-layout"; +import * as button from "ui/button"; +import * as enums from "ui/enums"; export function createPage() { var StackLayout = new sp.StackLayout(); var grid = new gridModule.GridLayout(); - grid.horizontalAlignment = enums.HorizontalAlignment.left; + grid.horizontalAlignment = "left"; StackLayout.addChild(grid); @@ -25,7 +25,7 @@ export function createPage() { grid.addChild(btn4); var sp1 = new sp.StackLayout(); - sp1.orientation = enums.Orientation.horizontal; + sp1.orientation = "horizontal"; sp1.height = 200; var b1 = new button.Button(); diff --git a/tests/app/pages/page12.ts b/tests/app/pages/page12.ts index a0fb15e1e..6a7745e5e 100644 --- a/tests/app/pages/page12.ts +++ b/tests/app/pages/page12.ts @@ -1,16 +1,16 @@ -import pages = require("ui/page"); -import btns = require("ui/button"); -import tb = require("ui/text-field"); -import gridLayoutModule = require("ui/layouts/grid-layout"); +import * as pages from "ui/page"; +import * as btns from "ui/button"; +import * as tb from "ui/text-field"; +import * as gridLayoutModule from "ui/layouts/grid-layout"; export function createPage() { var page = new pages.Page(); var gridLayout = new gridLayoutModule.GridLayout(); var lengths = [ - new gridLayoutModule.ItemSpec(140, gridLayoutModule.GridUnitType.pixel), - new gridLayoutModule.ItemSpec(1, gridLayoutModule.GridUnitType.star), - new gridLayoutModule.ItemSpec(140, gridLayoutModule.GridUnitType.pixel) + new gridLayoutModule.ItemSpec(140, "pixel"), + new gridLayoutModule.ItemSpec(1, "star"), + new gridLayoutModule.ItemSpec(140, "pixel") ]; var rows = 2; @@ -19,7 +19,7 @@ export function createPage() { var col; for (row = 0; row < rows; row++) { - var rowDef = new gridLayoutModule.ItemSpec(1, gridLayoutModule.GridUnitType.auto); + var rowDef = new gridLayoutModule.ItemSpec(1, "auto"); gridLayout.addRow(rowDef); } diff --git a/tests/app/pages/page13.ts b/tests/app/pages/page13.ts index 725e43764..49ad53e0a 100644 --- a/tests/app/pages/page13.ts +++ b/tests/app/pages/page13.ts @@ -1,6 +1,6 @@ -import pages = require("ui/page"); -import btns = require("ui/button"); -import layout = require("ui/layouts/stack-layout"); +import * as pages from "ui/page"; +import * as btns from "ui/button"; +import * as layout from "ui/layouts/stack-layout"; export function createPage() { var page = new pages.Page(); @@ -23,11 +23,11 @@ export function createPage() { return page; } -function addButton(layout: layout.StackLayout, text: string) { +function addButton(layout: layout.StackLayout, text: "left" | "center" | "middle" | "right" | "stretch") { var btn = new btns.Button(); btn.text = text; btn.horizontalAlignment = text; layout.addChild(btn); - layout.paddingLeft = 5; + layout.style.paddingLeft = 5; return btn; } \ No newline at end of file diff --git a/tests/app/pages/page15.ts b/tests/app/pages/page15.ts index 582cdea79..305f6404e 100644 --- a/tests/app/pages/page15.ts +++ b/tests/app/pages/page15.ts @@ -1,14 +1,14 @@ -import enums = require("ui/enums"); -import pageModule = require("ui/page"); -import buttonModule = require("ui/button"); -import stackModule = require("ui/layouts/stack-layout"); +import * as enums from "ui/enums"; +import * as pageModule from "ui/page"; +import * as buttonModule from "ui/button"; +import * as stackModule from "ui/layouts/stack-layout"; export function createPage() { var page = new pageModule.Page(); var stackLayout = new stackModule.StackLayout(); var btn1 = new buttonModule.Button(); - btn1.horizontalAlignment = enums.HorizontalAlignment.left; - btn1.verticalAlignment = enums.VerticalAlignment.top; + btn1.horizontalAlignment = "left"; + btn1.verticalAlignment = "top"; btn1.marginTop = 10; btn1.marginRight = 0; btn1.marginBottom = 10; @@ -16,18 +16,18 @@ export function createPage() { btn1.text = "top, left"; var btn2 = new buttonModule.Button(); - btn2.horizontalAlignment = enums.HorizontalAlignment.center; - btn2.verticalAlignment = enums.VerticalAlignment.center; + btn2.horizontalAlignment = "center"; + btn2.verticalAlignment = "center"; btn2.text = "center, center"; var btn3 = new buttonModule.Button(); - btn3.horizontalAlignment = enums.HorizontalAlignment.right; - btn3.verticalAlignment = enums.VerticalAlignment.bottom; + btn3.horizontalAlignment = "right"; + btn3.verticalAlignment = "bottom"; btn3.text = "bottom, right"; var btn4 = new buttonModule.Button(); - btn4.horizontalAlignment = enums.HorizontalAlignment.stretch; - btn4.verticalAlignment = enums.VerticalAlignment.stretch; + btn4.horizontalAlignment = "stretch"; + btn4.verticalAlignment = "stretch"; btn4.text = "stretch, stretch"; stackLayout.addChild(btn1); diff --git a/tests/app/pages/page16.ts b/tests/app/pages/page16.ts index b349d1fa5..8a253c3da 100644 --- a/tests/app/pages/page16.ts +++ b/tests/app/pages/page16.ts @@ -1,7 +1,7 @@ -import pageModule = require("ui/page"); -import buttonModule = require("ui/button"); -import stackModule = require("ui/layouts/stack-layout"); -import frame = require("ui/frame"); +import * as pageModule from "ui/page"; +import * as buttonModule from "ui/button"; +import * as stackModule from "ui/layouts/stack-layout"; +import * as frame from "ui/frame"; export function createPage() { var page = new pageModule.Page(); diff --git a/tests/app/pages/page17.ts b/tests/app/pages/page17.ts index 6c1b531db..a832f7a67 100644 --- a/tests/app/pages/page17.ts +++ b/tests/app/pages/page17.ts @@ -1,7 +1,7 @@ -import observable = require("data/observable"); -import action = require("ui/action-bar"); +import * as observable from "data/observable"; +import * as action from "ui/action-bar"; -import pages = require("ui/page"); +import * as pages from "ui/page"; var currentPage:pages.Page; // Event handler for Page "loaded" event attached in main-page.xml diff --git a/tests/app/pages/page18.ts b/tests/app/pages/page18.ts index 7e10910e6..155255300 100644 --- a/tests/app/pages/page18.ts +++ b/tests/app/pages/page18.ts @@ -1,7 +1,7 @@ -import frame = require("ui/frame"); -import observable = require("data/observable"); +import * as frame from "ui/frame"; +import * as observable from "data/observable"; -import trace = require("trace"); +import * as trace from "trace"; trace.setCategories("gestures"); trace.enable(); diff --git a/tests/app/pages/page19.ts b/tests/app/pages/page19.ts index 8499afb35..c6c4f0c08 100644 --- a/tests/app/pages/page19.ts +++ b/tests/app/pages/page19.ts @@ -1,5 +1,5 @@ -import observable = require("data/observable"); -import trace = require("trace"); +import * as observable from "data/observable"; +import * as trace from "trace"; trace.addCategories(trace.categories.Layout); trace.enable(); diff --git a/tests/app/pages/page20.ts b/tests/app/pages/page20.ts index 96700ff74..fdb312e3f 100644 --- a/tests/app/pages/page20.ts +++ b/tests/app/pages/page20.ts @@ -1,5 +1,5 @@ -import observable = require("data/observable"); -import trace = require("trace"); +import * as observable from "data/observable"; +import * as trace from "trace"; import {Button} from "ui/button"; import {Page} from "ui/page"; trace.addCategories(trace.categories.Layout); diff --git a/tests/app/pages/page5.ts b/tests/app/pages/page5.ts index 30099e38e..ba8ac19ef 100644 --- a/tests/app/pages/page5.ts +++ b/tests/app/pages/page5.ts @@ -1,8 +1,8 @@ -import gridModule = require("ui/layouts/grid-layout"); -import pages = require("ui/page"); -import buttons = require("ui/button"); -import app = require("application"); -import platform = require("platform"); +import * as gridModule from "ui/layouts/grid-layout"; +import * as pages from "ui/page"; +import * as buttons from "ui/button"; +import * as app from "application"; +import * as platform from "platform"; import * as utils from "utils/utils"; diff --git a/tests/app/pages/page6.ts b/tests/app/pages/page6.ts index d95a14745..75abe65d9 100644 --- a/tests/app/pages/page6.ts +++ b/tests/app/pages/page6.ts @@ -1,5 +1,5 @@ -import pages = require("ui/page"); -import fpsModule = require("fps-meter"); +import * as pages from "ui/page"; +import * as fpsModule from "fps-meter"; export function createPage() { var startTime; diff --git a/tests/app/pages/page7.ts b/tests/app/pages/page7.ts index 01217d9d5..17d0c0743 100644 --- a/tests/app/pages/page7.ts +++ b/tests/app/pages/page7.ts @@ -1,5 +1,5 @@ -import pages = require("ui/page"); -import buttons = require("ui/button"); +import * as pages from "ui/page"; +import * as buttons from "ui/button"; export function createPage() { var page = new pages.Page(); diff --git a/tests/app/pages/page8.ts b/tests/app/pages/page8.ts index 2ca481b73..081edf2dd 100644 --- a/tests/app/pages/page8.ts +++ b/tests/app/pages/page8.ts @@ -1,11 +1,11 @@ -import btns = require("ui/button"); -import pages = require("ui/page"); -import stacks = require("ui/layouts/stack-layout"); -import scroll = require("ui/scroll-view"); -import textView = require("ui/text-view"); -import timer = require("timer"); -import http = require("http"); -import trace = require("trace"); +import * as btns from "ui/button"; +import * as pages from "ui/page"; +import * as stacks from "ui/layouts/stack-layout"; +import * as scroll from "ui/scroll-view"; +import * as textView from "ui/text-view"; +import * as timer from "timer"; +import * as http from "http"; +import * as trace from "trace"; trace.enable(); trace.setCategories(trace.categories.Style); diff --git a/tests/app/pages/page9.ts b/tests/app/pages/page9.ts index 491861d07..a5439964d 100644 --- a/tests/app/pages/page9.ts +++ b/tests/app/pages/page9.ts @@ -1,22 +1,22 @@ -import pages = require("ui/page"); -import imageSource = require("image-source"); -import gridModule = require("ui/layouts/grid-layout"); -import enums = require("ui/enums"); -import img = require("ui/image"); +import * as pages from "ui/page"; +import * as imageSource from "image-source"; +import * as gridModule from "ui/layouts/grid-layout"; +import * as enums from "ui/enums"; +import * as img from "ui/image"; export function createPage() { var grid = new gridModule.GridLayout(); - grid.addColumn(new gridModule.ItemSpec(1, gridModule.GridUnitType.auto)); - grid.addColumn(new gridModule.ItemSpec(1, gridModule.GridUnitType.star)); + grid.addColumn(new gridModule.ItemSpec(1, "auto")); + grid.addColumn(new gridModule.ItemSpec(1, "star")); - grid.addRow(new gridModule.ItemSpec(1, gridModule.GridUnitType.auto)); - grid.addRow(new gridModule.ItemSpec(1, gridModule.GridUnitType.star)); + grid.addRow(new gridModule.ItemSpec(1, "auto")); + grid.addRow(new gridModule.ItemSpec(1, "star")); var image = new img.Image(); - image.stretch = enums.Stretch.fill; - image.verticalAlignment = enums.VerticalAlignment.bottom; - image.horizontalAlignment = enums.HorizontalAlignment.center; + image.stretch = "fill"; + image.verticalAlignment = "bottom"; + image.horizontalAlignment = "center"; image.imageSource = imageSource.fromFile(__dirname + "/test.png"); grid.addChild(image); diff --git a/tests/app/pages/performance-test/start.ts b/tests/app/pages/performance-test/start.ts index 1dcbec2cb..900aa7cc1 100644 --- a/tests/app/pages/performance-test/start.ts +++ b/tests/app/pages/performance-test/start.ts @@ -1,5 +1,5 @@ -import frame = require("ui/frame"); -import observable = require("data/observable"); +import * as frame from "ui/frame"; +import * as observable from "data/observable"; declare function __startCPUProfiler(name: string); diff --git a/tests/app/pages/performance-test/test-big.ts b/tests/app/pages/performance-test/test-big.ts index ebe3a152e..f81436fba 100644 --- a/tests/app/pages/performance-test/test-big.ts +++ b/tests/app/pages/performance-test/test-big.ts @@ -1,4 +1,4 @@ -import observable = require("data/observable"); +import * as observable from "data/observable"; declare function __stopCPUProfiler(name: string); diff --git a/tests/app/pages/performance-test/test-small.ts b/tests/app/pages/performance-test/test-small.ts index 5dcbb408e..c6d12d41d 100644 --- a/tests/app/pages/performance-test/test-small.ts +++ b/tests/app/pages/performance-test/test-small.ts @@ -1,4 +1,4 @@ -import observable = require("data/observable"); +import * as observable from "data/observable"; declare function __stopCPUProfiler(name: string); diff --git a/tests/app/pages/property-bindings.ts b/tests/app/pages/property-bindings.ts index 07700dc0e..7c03f96d6 100644 --- a/tests/app/pages/property-bindings.ts +++ b/tests/app/pages/property-bindings.ts @@ -1,14 +1,14 @@ -import btns = require("ui/button"); -import pages = require("ui/page"); -import stacks = require("ui/layouts/stack-layout"); -import scroll = require("ui/scroll-view"); -import textView = require("ui/text-view"); -import labels = require("ui/label"); -import trace = require("trace"); -import gridModule = require("ui/layouts/grid-layout"); -import sliders = require("ui/slider"); -import switches = require("ui/switch"); -import bindable = require("ui/core/bindable"); +import * as btns from "ui/button"; +import * as pages from "ui/page"; +import * as stacks from "ui/layouts/stack-layout"; +import * as scroll from "ui/scroll-view"; +import * as textView from "ui/text-view"; +import * as labels from "ui/label"; +import * as trace from "trace"; +import * as gridModule from "ui/layouts/grid-layout"; +import * as sliders from "ui/slider"; +import * as switches from "ui/switch"; +import * as bindable from "ui/core/bindable"; trace.enable(); //trace.setCategories(trace.categories.Style + " ," + trace.categories.Binding); diff --git a/tests/app/pages/sandbox-project.ts b/tests/app/pages/sandbox-project.ts index c0e926b41..0dfede83c 100644 --- a/tests/app/pages/sandbox-project.ts +++ b/tests/app/pages/sandbox-project.ts @@ -1,2 +1,2 @@ -import application = require("application"); +import * as application from "application"; application.start({ moduleName: "apps/tests/pages/nnikolovTestPage" }); \ No newline at end of file diff --git a/tests/app/platform-tests.ts b/tests/app/platform-tests.ts index 956540845..07b866ead 100644 --- a/tests/app/platform-tests.ts +++ b/tests/app/platform-tests.ts @@ -1,9 +1,9 @@ -import TKUnit = require("./TKUnit"); -import app = require("application"); +import * as TKUnit from "./TKUnit"; +import * as app from "application"; import { isIOS, isAndroid } from "platform"; // >> platform-require -import platformModule = require("platform"); +import * as platformModule from "platform"; // << platform-require export function test_setTimeout_isDefined() { diff --git a/tests/app/styling/app.ts b/tests/app/styling/app.ts index fcb9e07da..699a29af8 100644 --- a/tests/app/styling/app.ts +++ b/tests/app/styling/app.ts @@ -1,6 +1,6 @@ -import application = require("application"); +import * as application from "application"; -import trace = require("trace"); +import * as trace from "trace"; trace.enable(); trace.setCategories(trace.categories.concat( trace.categories.Layout diff --git a/tests/app/styling/mainPage.ts b/tests/app/styling/mainPage.ts index 566acfaae..311e5998b 100644 --- a/tests/app/styling/mainPage.ts +++ b/tests/app/styling/mainPage.ts @@ -1,11 +1,11 @@ -import pagesModule = require("ui/page"); -import enums = require("ui/enums"); -import stackLayoutModule = require("ui/layouts/stack-layout"); -import buttonModule = require("ui/button"); -import labelModule = require("ui/label"); -import textFieldModule = require("ui/text-field"); -import textViewModule = require("ui/text-view"); -import colorModule = require("color"); +import * as pagesModule from "ui/page"; +import * as enums from "ui/enums"; +import * as stackLayoutModule from "ui/layouts/stack-layout"; +import * as buttonModule from "ui/button"; +import * as labelModule from "ui/label"; +import * as textFieldModule from "ui/text-field"; +import * as textViewModule from "ui/text-view"; +import * as colorModule from "color"; export function createPage() { var width = 200; diff --git a/tests/app/testRunner.ts b/tests/app/testRunner.ts index c0c47631a..817ca54ea 100644 --- a/tests/app/testRunner.ts +++ b/tests/app/testRunner.ts @@ -7,7 +7,7 @@ import { Button } from "ui/button"; import { StackLayout } from "ui/layouts/stack-layout"; import * as platform from "platform"; import "./ui-test"; -import fs = require("file-system"); +import * as fs from "file-system"; Frame.defaultAnimatedNavigation = false; diff --git a/tests/app/text/formatted-string-tests.ts b/tests/app/text/formatted-string-tests.ts index a1d3f4e06..9a89d00aa 100644 --- a/tests/app/text/formatted-string-tests.ts +++ b/tests/app/text/formatted-string-tests.ts @@ -1,11 +1,11 @@ // >> formatted-string-require -import formattedStringModule = require("text/formatted-string"); -import spanModule = require("text/span"); +import * as formattedStringModule from "text/formatted-string"; +import * as spanModule from "text/span"; // << formatted-string-require -import observable = require("data/observable"); -import TKUnit = require("../TKUnit"); -import LabelModule = require("ui/label"); +import * as observable from "data/observable"; +import * as TKUnit from "../TKUnit"; +import * as LabelModule from "ui/label"; export var test_FormattedString_RemovesEventListeners_for_spans = function () { // >> formatted-string-set diff --git a/tests/app/timer-tests.ts b/tests/app/timer-tests.ts index 23baaab55..7f1f5aec1 100644 --- a/tests/app/timer-tests.ts +++ b/tests/app/timer-tests.ts @@ -1,5 +1,5 @@ -import TKUnit = require("./TKUnit"); -import timer = require("timer"); +import * as TKUnit from "./TKUnit"; +import * as timer from "timer"; // >> timer-require // require("globals"); diff --git a/tests/app/trace-tests.ts b/tests/app/trace-tests.ts index f74df8b0e..721ede745 100644 --- a/tests/app/trace-tests.ts +++ b/tests/app/trace-tests.ts @@ -1,5 +1,5 @@ // >> trace-require -import trace = require("trace"); +import * as trace from "trace"; // << trace-require export var test_DummyTestForSnippetOnly0 = function () { diff --git a/tests/app/ui-test.ts b/tests/app/ui-test.ts index fa52f0a03..56fec64ff 100644 --- a/tests/app/ui-test.ts +++ b/tests/app/ui-test.ts @@ -1,8 +1,8 @@ import {Page} from "ui/page"; import {View} from "ui/core/view"; -import trace = require("trace"); -import navHelper = require("./ui/helper"); -import TKUnit = require("./TKUnit"); +import * as trace from "trace"; +import * as navHelper from "./ui/helper"; +import * as TKUnit from "./TKUnit"; export class UITest implements trace.TraceWriter { diff --git a/tests/app/ui/action-bar/ActionBar_NumberAsText.ts b/tests/app/ui/action-bar/ActionBar_NumberAsText.ts index f47a44149..9c760f32f 100644 --- a/tests/app/ui/action-bar/ActionBar_NumberAsText.ts +++ b/tests/app/ui/action-bar/ActionBar_NumberAsText.ts @@ -1,4 +1,4 @@ -import frame = require("ui/frame"); +import * as frame from "ui/frame"; export function buttonTap(args) { frame.topmost().goBack(); diff --git a/tests/app/ui/action-bar/action-bar-tests-common.ts b/tests/app/ui/action-bar/action-bar-tests-common.ts index aec620c54..c883fad9c 100644 --- a/tests/app/ui/action-bar/action-bar-tests-common.ts +++ b/tests/app/ui/action-bar/action-bar-tests-common.ts @@ -1,15 +1,15 @@ -import TKUnit = require("../../TKUnit"); -import LabelModule = require("ui/label"); -import helper = require("../helper"); -import builder = require("ui/builder"); -import button = require("ui/button"); -import PageModule = require("ui/page"); -import viewModule = require("ui/core/view"); -import fs = require("file-system"); +import * as TKUnit from "../../TKUnit"; +import * as LabelModule from "ui/label"; +import * as helper from "../helper"; +import * as builder from "ui/builder"; +import * as button from "ui/button"; +import * as PageModule from "ui/page"; +import * as viewModule from "ui/core/view"; +import * as fs from "file-system"; import { Observable } from "data/observable"; // >> actionbar-common-require -import actionBarModule = require("ui/action-bar"); +import * as actionBarModule from "ui/action-bar"; // << actionbar-common-require export function test_actionItem_inherit_bindingContext() { diff --git a/tests/app/ui/action-bar/action-bar-tests.android.ts b/tests/app/ui/action-bar/action-bar-tests.android.ts index d498a4127..b1b0da572 100644 --- a/tests/app/ui/action-bar/action-bar-tests.android.ts +++ b/tests/app/ui/action-bar/action-bar-tests.android.ts @@ -1,5 +1,5 @@ -import actionTestsCommon = require("./action-bar-tests-common"); -import TKUnit = require("../../TKUnit"); +import * as actionTestsCommon from "./action-bar-tests-common"; +import * as TKUnit from "../../TKUnit"; import { ActionItem } from "ui/action-bar"; import { Visibility } from "ui/enums"; diff --git a/tests/app/ui/action-bar/action-bar-tests.ios.ts b/tests/app/ui/action-bar/action-bar-tests.ios.ts index badc27c16..b34b9c238 100644 --- a/tests/app/ui/action-bar/action-bar-tests.ios.ts +++ b/tests/app/ui/action-bar/action-bar-tests.ios.ts @@ -1,10 +1,10 @@ -import actionTestsCommon = require("./action-bar-tests-common"); -import PageModule = require("ui/page"); -import TKUnit = require("../../TKUnit"); -import LabelModule = require("ui/label"); -import helper = require("../helper"); -import view = require("ui/core/view"); -import actionBar = require("ui/action-bar"); +import * as actionTestsCommon from "./action-bar-tests-common"; +import * as PageModule from "ui/page"; +import * as TKUnit from "../../TKUnit"; +import * as LabelModule from "ui/label"; +import * as helper from "../helper"; +import * as view from "ui/core/view"; +import * as actionBar from "ui/action-bar"; import { Visibility } from "ui/enums"; global.moduleMerge(actionTestsCommon, exports); diff --git a/tests/app/ui/activity-indicator/activity-indicator-tests.ts b/tests/app/ui/activity-indicator/activity-indicator-tests.ts index c61166b88..4c5952bcf 100644 --- a/tests/app/ui/activity-indicator/activity-indicator-tests.ts +++ b/tests/app/ui/activity-indicator/activity-indicator-tests.ts @@ -1,12 +1,12 @@ -import TKUnit = require("../../TKUnit"); -import helper = require("../helper"); -import viewModule = require("ui/core/view"); -import imageModule = require("ui/image"); -import platform = require("platform"); -import color = require("color"); +import * as TKUnit from "../../TKUnit"; +import * as helper from "../helper"; +import * as viewModule from "ui/core/view"; +import * as imageModule from "ui/image"; +import * as platform from "platform"; +import * as color from "color"; // >> activity-indicator-require -import activityIndicatorModule = require("ui/activity-indicator"); +import * as activityIndicatorModule from "ui/activity-indicator"; // << activity-indicator-require export function test_default_TNS_values() { @@ -19,6 +19,7 @@ export function test_default_TNS_values() { export function test_default_native_values() { var indicator = new activityIndicatorModule.ActivityIndicator(); + indicator.width = 50; indicator.height = 50; diff --git a/tests/app/ui/animation/animation-tests.ts b/tests/app/ui/animation/animation-tests.ts index 9df8980a8..4395cc5c5 100644 --- a/tests/app/ui/animation/animation-tests.ts +++ b/tests/app/ui/animation/animation-tests.ts @@ -1,13 +1,13 @@ -import TKUnit = require("../../TKUnit"); -import helper = require("../helper"); -import viewModule = require("ui/core/view"); +import * as TKUnit from "../../TKUnit"; +import * as helper from "../helper"; +import * as viewModule from "ui/core/view"; import {Label} from "ui/label"; import {StackLayout} from "ui/layouts/stack-layout"; -import colorModule = require("color"); -import enums = require("ui/enums"); +import * as colorModule from "color"; +import * as enums from "ui/enums"; // >> animation-require -import animation = require("ui/animation"); +import * as animation from "ui/animation"; // << animation-require function prepareTest(): Label { diff --git a/tests/app/ui/animation/css-animation-tests.ts b/tests/app/ui/animation/css-animation-tests.ts index c4c607e5f..59383f591 100644 --- a/tests/app/ui/animation/css-animation-tests.ts +++ b/tests/app/ui/animation/css-animation-tests.ts @@ -1,15 +1,16 @@ -import TKUnit = require("../../TKUnit"); -import styleScope = require("ui/styling/style-scope"); -import keyframeAnimation = require("ui/animation/keyframe-animation"); -import enums = require("ui/enums"); -import helper = require("../../ui/helper"); -import stackModule = require("ui/layouts/stack-layout"); -import labelModule = require("ui/label"); -import color = require("color"); +import * as TKUnit from "../../TKUnit"; +import * as styleScope from "ui/styling/style-scope"; +import * as keyframeAnimation from "ui/animation/keyframe-animation"; +import * as enums from "ui/enums"; +import * as helper from "../../ui/helper"; +import * as stackModule from "ui/layouts/stack-layout"; +import * as labelModule from "ui/label"; +import * as color from "color"; import {SelectorCore} from "ui/styling/css-selector"; +import { unsetValue } from "ui/core/view"; -//import styling = require("ui/styling"); +//import * as styling from "ui/styling"; function createAnimationFromCSS(css: string, name: string): keyframeAnimation.KeyframeAnimationInfo { let scope = new styleScope.StyleScope(); @@ -260,11 +261,11 @@ export function test_ExecuteCSSAnimation() { //export function test_ExecuteFillMode() { // let mainPage = helper.getCurrentPage(); -// mainPage.style._resetValue(styling.properties.backgroundColorProperty); -// mainPage.style._resetValue(styling.properties.colorProperty); -// mainPage._resetValue(labelModule.Label.bindingContextProperty); -// mainPage._resetValue(labelModule.Label.cssClassProperty); -// mainPage._resetValue(labelModule.Label.idProperty); +// mainPage.style.backgroundColor = unsetValue; +// mainpage.style.color = unsetValue; +// mainPage.bindingContext = unsetValue; +// mainPage.cssClass = unsetValue; +// mainPage.id = unsetValue; // mainPage.css = null; // let label = new labelModule.Label({ text: "label" }); diff --git a/tests/app/ui/bindable-tests.ts b/tests/app/ui/bindable-tests.ts index c3e1d7673..b075af6e0 100644 --- a/tests/app/ui/bindable-tests.ts +++ b/tests/app/ui/bindable-tests.ts @@ -1,20 +1,20 @@ -import observable = require("data/observable"); -import bindable = require("ui/core/bindable"); -import dependencyObservableModule = require("ui/core/dependency-observable"); -import TKUnit = require("../TKUnit"); -import types = require("utils/types"); -import helper = require("../ui/helper"); -import viewModule = require("ui/core/view"); -import buttonModule = require("ui/button"); -import utils = require("utils/utils"); -import pageModule = require("ui/page"); -import stackLayoutModule = require("ui/layouts/stack-layout"); -import bindingBuilder = require("ui/builder/binding-builder"); -import labelModule = require("ui/label"); -import textFieldModule = require("ui/text-field"); -import fs = require("file-system"); -import appModule = require("application"); -import trace = require("trace"); +import * as observable from "data/observable"; +import * as bindable from "ui/core/bindable"; +import * as dependencyObservableModule from "ui/core/dependency-observable"; +import * as TKUnit from "../TKUnit"; +import * as types from "utils/types"; +import * as helper from "../ui/helper"; +import * as viewModule from "ui/core/view"; +import * as buttonModule from "ui/button"; +import * as utils from "utils/utils"; +import * as pageModule from "ui/page"; +import * as stackLayoutModule from "ui/layouts/stack-layout"; +import * as bindingBuilder from "ui/builder/binding-builder"; +import * as labelModule from "ui/label"; +import * as textFieldModule from "ui/text-field"; +import * as fs from "file-system"; +import * as appModule from "application"; +import * as trace from "trace"; // // For information and examples how to use bindings please refer to special [**Data binding**](../../../../bindings.md) topic. diff --git a/tests/app/ui/binding-expressions-tests.ts b/tests/app/ui/binding-expressions-tests.ts index 4e8bd96e9..f681e511f 100644 --- a/tests/app/ui/binding-expressions-tests.ts +++ b/tests/app/ui/binding-expressions-tests.ts @@ -1,7 +1,7 @@ -import frameModule = require("ui/frame"); -import textFieldModule = require("ui/text-field"); -import fs = require("file-system"); -import helper = require("../ui/helper"); +import * as frameModule from "ui/frame"; +import * as textFieldModule from "ui/text-field"; +import * as fs from "file-system"; +import * as helper from "../ui/helper"; export var test_BindingExpressions_ArrayAccess = function () { navigateToPage("bindingExpressions_arrayAccess_testPage"); diff --git a/tests/app/ui/bindingContext_testPage.ts b/tests/app/ui/bindingContext_testPage.ts index eabc1483b..7424c2c46 100644 --- a/tests/app/ui/bindingContext_testPage.ts +++ b/tests/app/ui/bindingContext_testPage.ts @@ -1,5 +1,5 @@ -import observableModule = require("data/observable"); -import pageModule = require("ui/page"); +import * as observableModule from "data/observable"; +import * as pageModule from "ui/page"; class MainViewModel extends observableModule.Observable { private _item: any; diff --git a/tests/app/ui/bindingContext_testPage1.ts b/tests/app/ui/bindingContext_testPage1.ts index 670eac633..6c71ea866 100644 --- a/tests/app/ui/bindingContext_testPage1.ts +++ b/tests/app/ui/bindingContext_testPage1.ts @@ -1,5 +1,5 @@ -import observable = require("data/observable"); -import pageModule = require("ui/page"); +import * as observable from "data/observable"; +import * as pageModule from "ui/page"; function loadViewModel() { viewModel.set("testProperty", "Alabala"); diff --git a/tests/app/ui/bindingContext_testPage2.ts b/tests/app/ui/bindingContext_testPage2.ts index 91c4cafd2..1003beb7d 100644 --- a/tests/app/ui/bindingContext_testPage2.ts +++ b/tests/app/ui/bindingContext_testPage2.ts @@ -1,4 +1,4 @@ -import pageModule = require("ui/page"); +import * as pageModule from "ui/page"; export function pageNavigatedTo(args: pageModule.NavigatedData) { var page = args.object; diff --git a/tests/app/ui/button/button-tests-native.android.ts b/tests/app/ui/button/button-tests-native.android.ts index 4709b4b43..ba022a6ef 100644 --- a/tests/app/ui/button/button-tests-native.android.ts +++ b/tests/app/ui/button/button-tests-native.android.ts @@ -1,7 +1,7 @@ -import buttonModule = require("ui/button"); -import colorModule = require("color"); -import utilsModule = require("utils/utils"); -import enums = require("ui/enums"); +import * as buttonModule from "ui/button"; +import * as colorModule from "color"; +import * as utilsModule from "utils/utils"; +import * as enums from "ui/enums"; export function getNativeText(button: buttonModule.Button): string { return button.android.getText(); diff --git a/tests/app/ui/button/button-tests-native.d.ts b/tests/app/ui/button/button-tests-native.d.ts index 796aaadbc..b315b0418 100644 --- a/tests/app/ui/button/button-tests-native.d.ts +++ b/tests/app/ui/button/button-tests-native.d.ts @@ -1,6 +1,6 @@ //@private -import buttonModule = require("ui/button"); -import colorModule = require("color"); +import * as buttonModule from "ui/button"; +import * as colorModule from "color"; export declare function getNativeText(button: buttonModule.Button): string; export declare function getNativeTextWrap(button: buttonModule.Button): boolean; diff --git a/tests/app/ui/button/button-tests-native.ios.ts b/tests/app/ui/button/button-tests-native.ios.ts index 77774752b..0074829fd 100644 --- a/tests/app/ui/button/button-tests-native.ios.ts +++ b/tests/app/ui/button/button-tests-native.ios.ts @@ -1,7 +1,7 @@ -import buttonModule = require("ui/button"); -import colorModule = require("color"); -import utilsModule = require("utils/utils"); -import enums = require("ui/enums"); +import * as buttonModule from "ui/button"; +import * as colorModule from "color"; +import * as utilsModule from "utils/utils"; +import * as enums from "ui/enums"; export function getNativeText(button: buttonModule.Button): string { return button.ios.titleForState(UIControlState.Normal); diff --git a/tests/app/ui/button/button-tests.ts b/tests/app/ui/button/button-tests.ts index 43050eb2d..18ccc7326 100644 --- a/tests/app/ui/button/button-tests.ts +++ b/tests/app/ui/button/button-tests.ts @@ -1,20 +1,20 @@ -import TKUnit = require("../../TKUnit"); -import helper = require("../helper"); -import viewModule = require("ui/core/view"); -import pagesModule = require("ui/page"); -import buttonTestsNative = require("./button-tests-native"); -import colorModule = require("color"); -import enums = require("ui/enums"); -import formattedStringModule = require("text/formatted-string"); -import spanModule = require("text/span"); +import * as TKUnit from "../../TKUnit"; +import * as helper from "../helper"; +import * as viewModule from "ui/core/view"; +import * as pagesModule from "ui/page"; +import * as buttonTestsNative from "./button-tests-native"; +import * as colorModule from "color"; +import * as enums from "ui/enums"; +import * as formattedStringModule from "text/formatted-string"; +import * as spanModule from "text/span"; // >> button-require -import buttonModule = require("ui/button"); +import * as buttonModule from "ui/button"; // << button-require // >> button-require-others -import bindable = require("ui/core/bindable"); -import observable = require("data/observable"); +import * as bindable from "ui/core/bindable"; +import * as observable from "data/observable"; // << button-require-others export var testSetText = function () { diff --git a/tests/app/ui/date-picker/date-picker-tests-native.android.ts b/tests/app/ui/date-picker/date-picker-tests-native.android.ts index e8326514b..d7a4f05bc 100644 --- a/tests/app/ui/date-picker/date-picker-tests-native.android.ts +++ b/tests/app/ui/date-picker/date-picker-tests-native.android.ts @@ -1,4 +1,4 @@ -import datePickerModule = require("ui/date-picker"); +import * as datePickerModule from "ui/date-picker"; export function getNativeYear(datePicker: datePickerModule.DatePicker): number { return datePicker.android.getYear(); diff --git a/tests/app/ui/date-picker/date-picker-tests-native.d.ts b/tests/app/ui/date-picker/date-picker-tests-native.d.ts index d27549c13..a793ea83d 100644 --- a/tests/app/ui/date-picker/date-picker-tests-native.d.ts +++ b/tests/app/ui/date-picker/date-picker-tests-native.d.ts @@ -1,5 +1,5 @@ //@private -import datePickerModule = require("ui/date-picker"); +import * as datePickerModule from "ui/date-picker"; export declare function getNativeYear(datePicker: datePickerModule.DatePicker): number; export declare function getNativeMonth(datePicker: datePickerModule.DatePicker): number; diff --git a/tests/app/ui/date-picker/date-picker-tests-native.ios.ts b/tests/app/ui/date-picker/date-picker-tests-native.ios.ts index 709bdd344..390558f6b 100644 --- a/tests/app/ui/date-picker/date-picker-tests-native.ios.ts +++ b/tests/app/ui/date-picker/date-picker-tests-native.ios.ts @@ -1,4 +1,4 @@ -import datePickerModule = require("ui/date-picker"); +import * as datePickerModule from "ui/date-picker"; import * as utils from "utils/utils"; diff --git a/tests/app/ui/date-picker/date-picker-tests.ts b/tests/app/ui/date-picker/date-picker-tests.ts index e430526e2..55711bdd8 100644 --- a/tests/app/ui/date-picker/date-picker-tests.ts +++ b/tests/app/ui/date-picker/date-picker-tests.ts @@ -1,11 +1,11 @@ -import TKUnit = require("../../TKUnit"); -import testModule = require("../../ui-test"); -import datePickerTestsNative = require("./date-picker-tests-native"); -import color = require("color"); -import platform = require("platform"); +import * as TKUnit from "../../TKUnit"; +import * as testModule from "../../ui-test"; +import * as datePickerTestsNative from "./date-picker-tests-native"; +import * as color from "color"; +import * as platform from "platform"; // >> date-picker-require -import datePickerModule = require("ui/date-picker"); +import * as datePickerModule from "ui/date-picker"; // << date-picker-require function assertDate(datePicker: datePickerModule.DatePicker, expectedYear: number, expectedMonth: number, expectedDay: number) { diff --git a/tests/app/ui/dependency-observable-tests.ts b/tests/app/ui/dependency-observable-tests.ts index 24a52dede..7231a9267 100644 --- a/tests/app/ui/dependency-observable-tests.ts +++ b/tests/app/ui/dependency-observable-tests.ts @@ -5,13 +5,13 @@ // This enables cascading values - e.g. default vs. inherited vs. local. // Load the module using the following code: // ``` JavaScript -import dependencyObservableModule = require("ui/core/dependency-observable"); +import * as dependencyObservableModule from "ui/core/dependency-observable"; // ``` // -import TKUnit = require("../TKUnit"); -import types = require("utils/types"); -import observableModule = require("data/observable"); +import * as TKUnit from "../TKUnit"; +import * as types from "utils/types"; +import * as observableModule from "data/observable"; var currentChangeData: dependencyObservableModule.PropertyChangeData; var propertyNameCount = 0; diff --git a/tests/app/ui/dialogs/dialog-tests.ts b/tests/app/ui/dialogs/dialog-tests.ts index a9038d41b..c8c5dc0c7 100644 --- a/tests/app/ui/dialogs/dialog-tests.ts +++ b/tests/app/ui/dialogs/dialog-tests.ts @@ -1,5 +1,5 @@ // >> dialog-require -import dialogs = require("ui/dialogs"); +import * as dialogs from "ui/dialogs"; // << dialog-require export function test_DummyTestForSnippetOnly0() { diff --git a/tests/app/ui/frame/frame-tests-common.ts b/tests/app/ui/frame/frame-tests-common.ts index 402ee6d0f..709be5709 100644 --- a/tests/app/ui/frame/frame-tests-common.ts +++ b/tests/app/ui/frame/frame-tests-common.ts @@ -1,10 +1,10 @@ // >> frame-require -import frameModule = require("ui/frame"); +import * as frameModule from "ui/frame"; var topmost = frameModule.topmost(); // << frame-require -import labelModule = require("ui/label"); -import pagesModule = require("ui/page"); +import * as labelModule from "ui/label"; +import * as pagesModule from "ui/page"; export var ignore_test_DummyTestForSnippetOnly0 = function () { // >> frame-navigating diff --git a/tests/app/ui/frame/frame-tests.android.ts b/tests/app/ui/frame/frame-tests.android.ts index ac2fc4364..1476f4eae 100644 --- a/tests/app/ui/frame/frame-tests.android.ts +++ b/tests/app/ui/frame/frame-tests.android.ts @@ -1,6 +1,6 @@ -import frameModule = require("ui/frame"); -import TKUnit = require("../../TKUnit"); -import { widthProperty, heightProperty } from "ui/styling/style"; +import * as frameModule from "ui/frame"; +import * as TKUnit from "../../TKUnit"; +import { unsetValue, PercentLength } from "ui/core/view"; export function test_percent_width_and_height_set_to_page_support() { let topFrame = frameModule.topmost(); @@ -23,11 +23,11 @@ export function test_percent_width_and_height_set_to_page_support() { TKUnit.assertEqual(currentPageHeight, Math.floor(topFrameHeight / 2), "Current page measuredHeight incorrect"); //reset values. - (currentPage.style)._resetValue(heightProperty); - (currentPage.style)._resetValue(widthProperty); + currentPage.height = unsetValue; + currentPage.width = unsetValue; - TKUnit.assert(isNaN(currentPage.width), "width"); - TKUnit.assert(isNaN(currentPage.height), "height"); + TKUnit.assertTrue(PercentLength.equals(currentPage.width, "auto")); + TKUnit.assertTrue(PercentLength.equals(currentPage.height, "auto")); } export function test_percent_margin_set_to_page_support() { @@ -57,8 +57,8 @@ export function test_percent_margin_set_to_page_support() { //reset values. currentPage.margin = "0"; - TKUnit.assertEqual(currentPage.marginLeft, 0, "marginLeft"); - TKUnit.assertEqual(currentPage.marginTop, 0, "marginTop"); - TKUnit.assertEqual(currentPage.marginRight, 0, "marginRight"); - TKUnit.assertEqual(currentPage.marginBottom, 0, "marginBottom"); + TKUnit.assertTrue(PercentLength.equals(currentPage.marginLeft, 0)); + TKUnit.assertTrue(PercentLength.equals(currentPage.marginTop, 0)); + TKUnit.assertTrue(PercentLength.equals(currentPage.marginRight, 0)); + TKUnit.assertTrue(PercentLength.equals(currentPage.marginBottom, 0)); } \ No newline at end of file diff --git a/tests/app/ui/frame/frame-tests.ios.ts b/tests/app/ui/frame/frame-tests.ios.ts index 8d294d8e6..13760cef9 100644 --- a/tests/app/ui/frame/frame-tests.ios.ts +++ b/tests/app/ui/frame/frame-tests.ios.ts @@ -1,6 +1,7 @@ -import frameModule = require("ui/frame"); -import TKUnit = require("../../TKUnit"); -import { widthProperty, heightProperty } from "ui/styling/style"; +import * as frameModule from "ui/frame"; +import * as TKUnit from "../../TKUnit"; +import { PercentLength, unsetValue } from "ui/core/view"; + var uiUtils = require("ui/utils"); export function test_percent_width_and_height_set_to_page_support() { @@ -10,9 +11,9 @@ export function test_percent_width_and_height_set_to_page_support() { (currentPage).width = "50%"; (currentPage).height = "50%"; - TKUnit.waitUntilReady(() => { - return currentPage.isLayoutValid; - }, 1); + TKUnit.waitUntilReady(() => { + return currentPage.isLayoutValid; + }, 1); let topFrameWidth = topFrame.getMeasuredWidth(); let topFrameHeight = topFrame.getMeasuredHeight(); @@ -24,11 +25,11 @@ export function test_percent_width_and_height_set_to_page_support() { TKUnit.assertEqual(currentPageHeight, Math.round(topFrameHeight / 2), "Current page measuredHeight incorrect"); //reset values. - (currentPage.style)._resetValue(heightProperty); - (currentPage.style)._resetValue(widthProperty); + currentPage.height = unsetValue; + currentPage.width = unsetValue; - TKUnit.assert(isNaN(currentPage.width), "width"); - TKUnit.assert(isNaN(currentPage.height), "height"); + TKUnit.assertTrue(PercentLength.equals(currentPage.width, "auto")); + TKUnit.assertTrue(PercentLength.equals(currentPage.height, "auto")); } export function test_percent_margin_set_to_page_support() { @@ -36,9 +37,9 @@ export function test_percent_margin_set_to_page_support() { let currentPage = topFrame.currentPage; currentPage.margin = "10%"; - TKUnit.waitUntilReady(() => { - return currentPage.isLayoutValid; - }, 1); + TKUnit.waitUntilReady(() => { + return currentPage.isLayoutValid; + }, 1); let topFrameWidth = topFrame.getMeasuredWidth(); let topFrameHeight = topFrame.getMeasuredHeight(); @@ -58,8 +59,8 @@ export function test_percent_margin_set_to_page_support() { //reset values. currentPage.margin = "0"; - TKUnit.assertEqual(currentPage.marginLeft, 0, "marginLeft"); - TKUnit.assertEqual(currentPage.marginTop, 0, "marginTop"); - TKUnit.assertEqual(currentPage.marginRight, 0, "marginRight"); - TKUnit.assertEqual(currentPage.marginBottom, 0, "marginBottom"); -} \ No newline at end of file + TKUnit.assertTrue(PercentLength.equals(currentPage.marginLeft, 0)); + TKUnit.assertTrue(PercentLength.equals(currentPage.marginTop, 0)); + TKUnit.assertTrue(PercentLength.equals(currentPage.marginRight, 0)); + TKUnit.assertTrue(PercentLength.equals(currentPage.marginBottom, 0)); +} diff --git a/tests/app/ui/gestures/gestures-tests.ts b/tests/app/ui/gestures/gestures-tests.ts index c8639856d..c813581a1 100644 --- a/tests/app/ui/gestures/gestures-tests.ts +++ b/tests/app/ui/gestures/gestures-tests.ts @@ -1,8 +1,8 @@ /* tslint:disable:no-unused-variable */ // >> gestures-require -import gestures = require("ui/gestures"); +import * as gestures from "ui/gestures"; // << gestures-require -import labelModule = require("ui/label"); +import * as labelModule from "ui/label"; export var test_DummyTestForSnippetOnly0 = function () { // >> gestures-double-tap diff --git a/tests/app/ui/helper.ts b/tests/app/ui/helper.ts index d434ffabd..59f3bc916 100644 --- a/tests/app/ui/helper.ts +++ b/tests/app/ui/helper.ts @@ -1,17 +1,17 @@ -import view = require("ui/core/view"); -import frame = require("ui/frame"); -import page = require("ui/page"); -import stackLayoutModule = require("ui/layouts/stack-layout"); -import button = require("ui/button"); -import TKUnit = require("../TKUnit"); -import utils = require("utils/utils"); -import types = require("utils/types"); -import styling = require("ui/styling"); -import platform = require("platform"); -import colorModule = require("color"); -import formattedStringModule = require("text/formatted-string"); -import spanModule = require("text/span"); -import enums = require("ui/enums"); +import * as view from "ui/core/view"; +import * as frame from "ui/frame"; +import * as page from "ui/page"; +import * as stackLayoutModule from "ui/layouts/stack-layout"; +import * as button from "ui/button"; +import * as TKUnit from "../TKUnit"; +import * as utils from "utils/utils"; +import * as types from "utils/types"; +import * as platform from "platform"; +import * as colorModule from "color"; +import * as formattedStringModule from "text/formatted-string"; +import * as spanModule from "text/span"; +import * as enums from "ui/enums"; +import { unsetValue } from "ui/core/view"; var DELTA = 0.1; @@ -29,11 +29,11 @@ function clearPage(): void { throw new Error("NO CURRENT PAGE!!!!"); } - newPage.style._resetValue(styling.properties.backgroundColorProperty); - newPage.style._resetValue(styling.properties.colorProperty); - newPage._resetValue(button.Button.bindingContextProperty); - newPage._resetValue(button.Button.cssClassProperty); - newPage._resetValue(button.Button.idProperty); + newPage.style.backgroundColor = unsetValue; + newPage.style.color = unsetValue; + newPage.bindingContext = unsetValue; + newPage.className = unsetValue; + newPage.id = unsetValue; } export function do_PageTest(test: (views: Array) => void, content: view.View, secondView: view.View, thirdView: view.View) { @@ -146,11 +146,11 @@ export function getCurrentPage(): page.Page { export function getClearCurrentPage(): page.Page { let page = frame.topmost().currentPage; - page.style._resetValue(styling.properties.backgroundColorProperty); - page.style._resetValue(styling.properties.colorProperty); - page._resetValue(button.Button.bindingContextProperty); - page._resetValue(button.Button.cssClassProperty); - page._resetValue(button.Button.idProperty); + page.style.backgroundColor = unsetValue; + page.style.color = unsetValue; + page.bindingContext = unsetValue; + page.className = unsetValue; + page.id = unsetValue; return page; } @@ -184,16 +184,12 @@ export function assertAreClose(actual: number, expected: number, message: string TKUnit.assertAreClose(actual, expected, delta, message); } -export function assertViewColor(testView: view.View, hexColor: string, valueSource?: number) { +export function assertViewColor(testView: view.View, hexColor: string) { TKUnit.assert(testView.style.color, "Color property not applied correctly. Style value is not defined."); TKUnit.assertEqual(testView.style.color.hex, hexColor, "color property"); - - if (types.isDefined(valueSource)) { - TKUnit.assertEqual(testView.style._getValueSource(styling.properties.colorProperty), valueSource, "valueSource"); - } } -export function assertViewBackgroundColor(testView: view.View, hexColor: string) { +export function assertViewBackgroundColor(testView: view.ViewBase, hexColor: string) { TKUnit.assert(testView.style.backgroundColor, "Background color property not applied correctly. Style value is not defined."); TKUnit.assertEqual(testView.style.backgroundColor.hex, hexColor, "backgroundColor property"); } diff --git a/tests/app/ui/html-view/html-view-tests.ts b/tests/app/ui/html-view/html-view-tests.ts index bb0b47c0a..2ed7bd50f 100644 --- a/tests/app/ui/html-view/html-view-tests.ts +++ b/tests/app/ui/html-view/html-view-tests.ts @@ -1,9 +1,9 @@ -import TKUnit = require("../../TKUnit"); -import helper = require("../helper"); -import types = require("utils/types"); +import * as TKUnit from "../../TKUnit"; +import * as helper from "../helper"; +import * as types from "utils/types"; // >> htmlview-require -import htmlViewModule = require("ui/html-view"); +import * as htmlViewModule from "ui/html-view"; // << htmlview-require var _createHtmlViewFunc = function (): htmlViewModule.HtmlView { diff --git a/tests/app/ui/image-cache/image-cache-tests.ts b/tests/app/ui/image-cache/image-cache-tests.ts index 1eb06ecfe..aa5615b9c 100644 --- a/tests/app/ui/image-cache/image-cache-tests.ts +++ b/tests/app/ui/image-cache/image-cache-tests.ts @@ -1,7 +1,7 @@ // >> image-cache-require -import imageCacheModule = require("ui/image-cache"); -import imageSource = require("image-source"); -import fs = require("file-system"); +import * as imageCacheModule from "ui/image-cache"; +import * as imageSource from "image-source"; +import * as fs from "file-system"; // << image-cache-require export function test_DummyTestForSnippetOnly() { diff --git a/tests/app/ui/image/image-tests.ts b/tests/app/ui/image/image-tests.ts index b0168bc1c..143458cd6 100644 --- a/tests/app/ui/image/image-tests.ts +++ b/tests/app/ui/image/image-tests.ts @@ -3,24 +3,24 @@ import { StackLayout } from "ui/layouts/stack-layout"; import { GridLayout } from "ui/layouts/grid-layout"; import { isIOS, isAndroid } from "platform"; import { PropertyChangeData } from "data/observable"; -import utils = require("utils/utils"); +import * as utils from "utils/utils"; // import {target} from "../../TKUnit"; -import TKUnit = require("../../TKUnit"); +import * as TKUnit from "../../TKUnit"; // >> img-require -import ImageModule = require("ui/image"); +import * as ImageModule from "ui/image"; // << img-require -import types = require("utils/types"); -import ImageSourceModule = require("image-source"); -import ViewModule = require("ui/core/view"); -import helper = require("../helper"); -import ObservableModule = require("data/observable"); -import enumsModule = require("ui/enums"); -import fs = require("file-system"); -import color = require("color"); +import * as types from "utils/types"; +import * as ImageSourceModule from "image-source"; +import * as ViewModule from "ui/core/view"; +import * as helper from "../helper"; +import * as ObservableModule from "data/observable"; +import * as enumsModule from "ui/enums"; +import * as fs from "file-system"; +import * as color from "color"; var imagePath = fs.path.join(__dirname, "../../logo.png"); @@ -185,7 +185,7 @@ export var test_SettingStretch_AspectFit = function () { // There are 4 modes of stretching none, fill, aspectFill, aspectFit // The default value is aspectFit. // Image stretch can be set by using ImageModule.stretch enum. - image.stretch = enumsModule.Stretch.aspectFit; + image.stretch = "aspectFit"; // << img-set-stretch var testFunc = function (views: Array) { @@ -231,7 +231,7 @@ export var test_SettingStretch_Default = function () { export var test_SettingStretch_AspectFill = function () { var image = new ImageModule.Image(); image.imageSource = ImageSourceModule.fromFile(imagePath); - image.stretch = enumsModule.Stretch.aspectFill; + image.stretch = "aspectFill"; var testFunc = function (views: Array) { var testImage = views[0]; @@ -254,7 +254,7 @@ export var test_SettingStretch_AspectFill = function () { export var test_SettingStretch_Fill = function () { var image = new ImageModule.Image(); image.imageSource = ImageSourceModule.fromFile(imagePath); - image.stretch = enumsModule.Stretch.fill; + image.stretch = "fill"; var testFunc = function (views: Array) { var testImage = views[0]; @@ -277,7 +277,7 @@ export var test_SettingStretch_Fill = function () { export var test_SettingStretch_none = function () { var image = new ImageModule.Image(); image.imageSource = ImageSourceModule.fromFile(imagePath); - image.stretch = enumsModule.Stretch.none; + image.stretch = "none"; var testFunc = function (views: Array) { var testImage = views[0]; @@ -306,8 +306,8 @@ export var test_SettingImageSourceWhenSizedToParentDoesNotRequestLayout = ios(() let image = new Image(); - host.width = 300; - host.height = 300; + host.width = {value: 300, unit:"dip"}; + host.height = {value: 300, unit:"dip"}; host.addChild(image); let mainPage = helper.getCurrentPage(); @@ -324,8 +324,8 @@ export var test_SettingImageSourceWhenSizedToParentDoesNotRequestLayout = ios(() export var test_SettingImageSourceWhenFixedWidthAndHeightDoesNotRequestLayout = ios(() => { let host = new StackLayout(); let image = new Image(); - image.width = 100; - image.height = 100; + image.width = {value: 100, unit:"dip"}; + image.height = {value: 100, unit:"dip"}; host.addChild(image); let mainPage = helper.getCurrentPage(); @@ -365,8 +365,8 @@ export var test_DimensionsAreRoundedAfterScale = function () { let density = utils.layout.getDisplayDensity(); let hostWidth = 320; - host.width = hostWidth / density; - host.height = hostWidth / density; + host.width = {value: hostWidth / density, unit:"dip"}; + host.height = {value: hostWidth / density, unit:"dip"}; host.addChild(image); let mainPage = helper.getCurrentPage(); mainPage.content = host; diff --git a/tests/app/ui/label/label-tests-native.android.ts b/tests/app/ui/label/label-tests-native.android.ts index e20f41a89..dc35137e5 100644 --- a/tests/app/ui/label/label-tests-native.android.ts +++ b/tests/app/ui/label/label-tests-native.android.ts @@ -1,6 +1,6 @@ -import labelModule = require("ui/label"); -import enums = require("ui/enums"); -import colorModule = require("color"); +import * as labelModule from "ui/label"; +import * as enums from "ui/enums"; +import * as colorModule from "color"; export function getNativeTextAlignment(label: labelModule.Label): string { var gravity = label.android.getGravity(); diff --git a/tests/app/ui/label/label-tests-native.d.ts b/tests/app/ui/label/label-tests-native.d.ts index 94d548ba1..60af53442 100644 --- a/tests/app/ui/label/label-tests-native.d.ts +++ b/tests/app/ui/label/label-tests-native.d.ts @@ -1,6 +1,6 @@ //@private -import labelModule = require("ui/label"); -import colorModule = require("color"); +import * as labelModule from "ui/label"; +import * as colorModule from "color"; export declare function getNativeTextAlignment(label: labelModule.Label): string; diff --git a/tests/app/ui/label/label-tests-native.ios.ts b/tests/app/ui/label/label-tests-native.ios.ts index 34b4428ff..5f6332bda 100644 --- a/tests/app/ui/label/label-tests-native.ios.ts +++ b/tests/app/ui/label/label-tests-native.ios.ts @@ -1,7 +1,7 @@ -import labelModule = require("ui/label"); -import enums = require("ui/enums"); -import colorModule = require("color"); -import utilsModule = require("utils/utils"); +import * as labelModule from "ui/label"; +import * as enums from "ui/enums"; +import * as colorModule from "color"; +import * as utilsModule from "utils/utils"; export function getNativeTextAlignment(label: labelModule.Label): string { switch (label.ios.textAlignment) { diff --git a/tests/app/ui/label/label-tests.ts b/tests/app/ui/label/label-tests.ts index f2eff2598..142be3dec 100644 --- a/tests/app/ui/label/label-tests.ts +++ b/tests/app/ui/label/label-tests.ts @@ -1,20 +1,19 @@ import * as TKUnit from "../../TKUnit"; -import testModule = require("../../ui-test"); -import styling = require("ui/styling"); +import * as testModule from "../../ui-test"; //>> label-require -import LabelModule = require("ui/label"); +import * as LabelModule from "ui/label"; // << label-require -import types = require("utils/types"); -import colorModule = require("color"); -import utils = require("utils/utils"); -import observableModule = require("data/observable"); -import bindable = require("ui/core/bindable"); -import textBase = require("ui/text-base"); -import enums = require("ui/enums"); -import labelTestsNative = require("./label-tests-native"); -import fs = require("file-system"); +import * as types from "utils/types"; +import * as colorModule from "color"; +import * as utils from "utils/utils"; +import * as observableModule from "data/observable"; +import * as bindable from "ui/core/bindable"; +import * as textBase from "ui/text-base"; +import * as enums from "ui/enums"; +import * as labelTestsNative from "./label-tests-native"; +import * as fs from "file-system"; import {StackLayout} from "ui/layouts/stack-layout"; import {GridLayout} from "ui/layouts/grid-layout"; @@ -22,7 +21,7 @@ import {isIOS} from "platform"; import {Label} from "ui/label"; import {LayoutBase} from "ui/layouts/layout-base"; import * as helper from "../helper"; -import viewModule = require("ui/core/view"); +import * as viewModule from "ui/core/view"; import {Page} from "ui/page"; export class LabelTest extends testModule.UITest { @@ -58,9 +57,7 @@ export class LabelTest extends testModule.UITest { var label = this.testView; var expectedValue = "Expected Value"; label.text = expectedValue; - - var actual = label._getValue(textBase.TextBase.textProperty); - TKUnit.assertEqual(actual, expectedValue, "Text not equal"); + TKUnit.assertEqual(label.text, expectedValue, "Text not equal"); } public test_Set_Text_Native() { @@ -119,7 +116,7 @@ export class LabelTest extends testModule.UITest { var expectedValue = new colorModule.Color("Red"); label.backgroundColor = expectedValue; - var actual = label.style._getValue(styling.properties.backgroundColorProperty); + var actual = label.style.backgroundColor; TKUnit.assertEqual(actual, expectedValue, "BackgroundColor not equal"); } @@ -435,7 +432,7 @@ export class LabelTest extends testModule.UITest { TKUnit.assertEqual(label.text, secondExpValue); } - private expectedTextAlignment = enums.TextAlignment.right; + private expectedTextAlignment: "right" = "right"; public testLocalTextAlignmentFromCss() { var label = this.testView; this.testPage.css = "label { text-align: " + this.expectedTextAlignment + "; }"; diff --git a/tests/app/ui/layouts/absolute-layout-tests.ts b/tests/app/ui/layouts/absolute-layout-tests.ts index a534124b2..f02c8227a 100644 --- a/tests/app/ui/layouts/absolute-layout-tests.ts +++ b/tests/app/ui/layouts/absolute-layout-tests.ts @@ -1,12 +1,12 @@ -import testModule = require("../../ui-test"); -import TKUnit = require("../../TKUnit"); -import labelModule = require("ui/label"); -import colorModule = require("color"); -import layoutHelper = require("./layout-helper"); -import commonTests = require("./common-layout-tests"); +import * as testModule from "../../ui-test"; +import * as TKUnit from "../../TKUnit"; +import * as labelModule from "ui/label"; +import * as colorModule from "color"; +import * as layoutHelper from "./layout-helper"; +import * as commonTests from "./common-layout-tests"; // >> absolute-layout-require -import absoluteLayoutModule = require("ui/layouts/absolute-layout"); +import * as absoluteLayoutModule from "ui/layouts/absolute-layout"; // << absolute-layout-require export class AbsoluteLayoutTest extends testModule.UITest { @@ -38,15 +38,15 @@ export class AbsoluteLayoutTest extends testModule.UITestbtn).width = "50%"; diff --git a/tests/app/ui/layouts/common-layout-tests.ts b/tests/app/ui/layouts/common-layout-tests.ts index a01cf809a..cac4f2cc5 100644 --- a/tests/app/ui/layouts/common-layout-tests.ts +++ b/tests/app/ui/layouts/common-layout-tests.ts @@ -1,10 +1,9 @@ -import TKUnit = require("../../TKUnit"); -import layoutHelper = require("./layout-helper"); -import enums = require("ui/enums"); -import testModule = require("../../ui-test"); -import {LayoutBase} from "ui/layouts/layout-base"; -import {widthProperty} from "ui/styling/style" -import platform = require("platform"); +import * as TKUnit from "../../TKUnit"; +import * as layoutHelper from "./layout-helper"; +import * as enums from "ui/enums"; +import * as testModule from "../../ui-test"; +import {LayoutBase, unsetValue, PercentLength} from "ui/layouts/layout-base"; +import * as platform from "platform"; function getNativeLayoutParams(nativeView: android.view.View): org.nativescript.widgets.CommonLayoutParams { var lp = nativeView.getLayoutParams(); @@ -21,12 +20,12 @@ export function percent_support_nativeLayoutParams_are_correct(test: testModule. } let layout = test.testView; - layout.width = layoutHelper.dp(200); - layout.height = layoutHelper.dp(200); + layout.width = { value: 200, unit: "px" }; + layout.height = { value: 200, unit: "px" }; let btn = new layoutHelper.MyButton(); - btn.width = layoutHelper.dp(100); - btn.height = layoutHelper.dp(100); + btn.width = { value: 100, unit: "px" }; + btn.height = { value: 100, unit: "px" }; btn.margin = "10%"; layout.addChild(btn); @@ -56,8 +55,9 @@ export function percent_support_nativeLayoutParams_are_correct(test: testModule. TKUnit.assertEqual(lp.heightPercent, 0.5, "heightPercent"); btn.margin = "0"; - btn.height = Number.NaN; - (btn.style)._resetValue(widthProperty); + btn.height = unsetValue; + btn.style.width = unsetValue; + test.waitUntilTestElementLayoutIsValid(); TKUnit.assertEqual(lp.width, -1, "width"); @@ -77,12 +77,12 @@ export function percent_support_nativeLayoutParams_are_correct(test: testModule. export function percent_support_children_test(test: testModule.UITest) { let layout: LayoutBase = test.testView; layout.removeChildren(); - layout.width = layoutHelper.dp(200); - layout.height = layoutHelper.dp(200); + layout.width = { value: 200, unit: "px" }; + layout.height = { value: 200, unit: "px" }; let btn = new layoutHelper.MyButton(); - btn.horizontalAlignment = enums.HorizontalAlignment.left; - btn.verticalAlignment = enums.VerticalAlignment.top; + btn.horizontalAlignment = "left"; + btn.verticalAlignment = "top"; (btn).width = "50%"; (btn).height = "50%"; btn.margin = "10%"; @@ -100,8 +100,8 @@ export function percent_support_children_test(test: testModule.UITestbtn.style)._resetValue(widthProperty); - btn.margin = "0"; - btn.horizontalAlignment = enums.HorizontalAlignment.stretch; - btn.verticalAlignment = enums.VerticalAlignment.stretch; - btn.height = Number.NaN; + btn.height = unsetValue; + btn.width = unsetValue; - TKUnit.assertEqual(btn.marginLeft, 0, "marginLeft"); - TKUnit.assertEqual(btn.marginTop, 0, "marginTop"); - TKUnit.assertEqual(btn.marginRight, 0, "marginRight"); - TKUnit.assertEqual(btn.marginBottom, 0, "marginBottom"); - TKUnit.assert(isNaN(btn.width), "width"); - TKUnit.assert(isNaN(btn.height), "height"); + btn.margin = "0"; + btn.horizontalAlignment = "stretch"; + btn.verticalAlignment = "stretch"; + btn.height = unsetValue; + + TKUnit.assertTrue(PercentLength.equals(btn.marginLeft, 0)); + TKUnit.assertTrue(PercentLength.equals(btn.marginTop, 0)); + TKUnit.assertTrue(PercentLength.equals(btn.marginRight, 0)); + TKUnit.assertTrue(PercentLength.equals(btn.marginBottom, 0)); + + TKUnit.assertTrue(PercentLength.equals(btn.width, "auto")); + TKUnit.assertTrue(PercentLength.equals(btn.height, "auto")); test.waitUntilTestElementLayoutIsValid(); diff --git a/tests/app/ui/layouts/dock-layout-tests.ts b/tests/app/ui/layouts/dock-layout-tests.ts index 328dc71d6..a864d5fb0 100644 --- a/tests/app/ui/layouts/dock-layout-tests.ts +++ b/tests/app/ui/layouts/dock-layout-tests.ts @@ -1,25 +1,26 @@ -import button = require("ui/button"); -import {DockLayout} from "ui/layouts/dock-layout"; -import TKUnit = require("../../TKUnit"); -import helper = require("./layout-helper"); -import testModule = require("../../ui-test"); -import layoutHelper = require("./layout-helper"); -import commonTests = require("./common-layout-tests"); +import * as button from "ui/button"; +import { DockLayout } from "ui/layouts/dock-layout"; +import * as TKUnit from "../../TKUnit"; +import * as helper from "./layout-helper"; +import * as testModule from "../../ui-test"; +import * as layoutHelper from "./layout-helper"; +import * as commonTests from "./common-layout-tests"; +import { PercentLength } from "ui/core/view"; // >> dock-layout-require -import dockModule = require("ui/layouts/dock-layout"); +import * as dockModule from "ui/layouts/dock-layout"; // << dock-layout-require // >> dock-layout-others -import enums = require("ui/enums"); +import * as enums from "ui/enums"; // << dock-layout-others export class DockLayoutTest extends testModule.UITest { public create(): DockLayout { let rootLayout = new DockLayout(); - rootLayout.height = layoutHelper.dp(300); - rootLayout.width = layoutHelper.dp(300); + rootLayout.height = { value: 300, unit: "px" }; + rootLayout.width = { value: 300, unit: "px" }; return rootLayout; } @@ -43,7 +44,7 @@ export class DockLayoutTest extends testModule.UITest { public test_dock_left() { var testBtn = new helper.MyButton(); - testBtn.width = layoutHelper.dp(20); + testBtn.width = { value: 20, unit: "px" } this.testView.stretchLastChild = false; this.testView.addChild(testBtn); @@ -54,7 +55,7 @@ export class DockLayoutTest extends testModule.UITest { public test_dock_right() { var testBtn = new helper.MyButton(); - testBtn.width = layoutHelper.dp(20); + testBtn.width = { value: 20, unit: "px" }; dockModule.DockLayout.setDock(testBtn, enums.Dock.right); this.testView.stretchLastChild = false; this.testView.addChild(testBtn); @@ -66,7 +67,7 @@ export class DockLayoutTest extends testModule.UITest { public test_dock_top() { var testBtn = new helper.MyButton(); - testBtn.height = layoutHelper.dp(20); + testBtn.height = { value: 20, unit: "px" }; dockModule.DockLayout.setDock(testBtn, enums.Dock.top); this.testView.stretchLastChild = false; this.testView.addChild(testBtn); @@ -78,7 +79,7 @@ export class DockLayoutTest extends testModule.UITest { public test_dock_button() { var testBtn = new helper.MyButton(); - testBtn.height = layoutHelper.dp(20); + testBtn.height = { value: 20, unit: "px" }; dockModule.DockLayout.setDock(testBtn, enums.Dock.bottom); this.testView.stretchLastChild = false; this.testView.addChild(testBtn); @@ -99,21 +100,21 @@ export class DockLayoutTest extends testModule.UITest { public test_dock_left_top_righ_bottom_fill() { var testBtnLeft = new helper.MyButton(); - testBtnLeft.width = layoutHelper.dp(20); + testBtnLeft.width = { value: 20, unit: "px" }; this.testView.addChild(testBtnLeft); var testBtnTop = new helper.MyButton(); - testBtnTop.height = layoutHelper.dp(20); + testBtnTop.height = { value: 20, unit: "px" }; dockModule.DockLayout.setDock(testBtnTop, enums.Dock.top); this.testView.addChild(testBtnTop); var testBtnRight = new helper.MyButton(); - testBtnRight.width = layoutHelper.dp(20); + testBtnRight.width = { value: 20, unit: "px" } dockModule.DockLayout.setDock(testBtnRight, enums.Dock.right); this.testView.addChild(testBtnRight); var testBtnBottom = new helper.MyButton(); - testBtnBottom.height = layoutHelper.dp(20); + testBtnBottom.height = { value: 20, unit: "px" } dockModule.DockLayout.setDock(testBtnBottom, enums.Dock.bottom); this.testView.addChild(testBtnBottom); @@ -133,10 +134,10 @@ export class DockLayoutTest extends testModule.UITest { public test_padding() { var testBtn = new helper.MyButton(); this.testView.addChild(testBtn); - this.testView.paddingLeft = layoutHelper.dp(10); - this.testView.paddingTop = layoutHelper.dp(20); - this.testView.paddingRight = layoutHelper.dp(30); - this.testView.paddingBottom = layoutHelper.dp(40); + this.testView.style.paddingLeft = { value: 10, unit: "px" }; + this.testView.style.paddingTop = { value: 20, unit: "px" }; + this.testView.style.paddingRight = { value: 30, unit: "px" }; + this.testView.style.paddingBottom = { value: 40, unit: "px" }; this.waitUntilTestElementLayoutIsValid(); @@ -148,7 +149,7 @@ export class DockLayoutTest extends testModule.UITest { // >> dock-layout-create var dockLayout = new dockModule.DockLayout(); // << dock-layout-create - + // >> dock-layout-addchild var btn = new button.Button(); dockLayout.addChild(btn); diff --git a/tests/app/ui/layouts/flexbox-layout-tests.ts b/tests/app/ui/layouts/flexbox-layout-tests.ts index fd8dff6b2..8cf216413 100644 --- a/tests/app/ui/layouts/flexbox-layout-tests.ts +++ b/tests/app/ui/layouts/flexbox-layout-tests.ts @@ -10,10 +10,10 @@ import { } from "ui/layouts/flexbox-layout"; // << flexbox-layout-require -import {View} from "ui/core/view"; +import {View, unsetValue} from "ui/core/view"; import {Label} from "ui/label"; -import TKUnit = require("../../TKUnit"); -import helper = require("../helper"); +import * as TKUnit from "../../TKUnit"; +import * as helper from "../helper"; import {layout} from "utils/utils"; import {parse} from "ui/builder"; @@ -37,14 +37,14 @@ function commonAncestor(view1: View, view2: View): View { return view1; } set.add(view1); - view1 = view1.parent; + view1 = view1.parent; } if (view2) { if (set.has(view2)) { return view2; } set.add(view2); - view2 = view2.parent; + view2 = view2.parent; } } while(view1 || view2); return null; @@ -68,7 +68,7 @@ function bounds(view: View): Bounds { function boundsToAncestor(child: View, ancestor: View = null) { let currentBounds = bounds(child); while(child && child !== ancestor) { - child = child.parent; + child = child.parent; let childBounds = bounds(child); currentBounds.left += childBounds.left; currentBounds.right += childBounds.left; @@ -172,7 +172,7 @@ function isAbove(view1: View, view2: View) { export function testFlexboxPage() { let page = helper.navigateWithEntry({ moduleName: "ui/layouts/flexbox-layout-page" }); function view(id: string) { - return page.getViewById(id); + return page.getViewById(id); } isLeftOf(view("six"), view("one")); isAbove(view("one"), view("scrollview")); @@ -494,8 +494,8 @@ export const testJustifyContent_flexStart_withParentPadding = test( ({root, flexbox, text1, text2, text3}) => { isRightOf(text2, text1); isRightOf(text3, text2); - equal(left(text1), dipToDp(flexbox.paddingLeft), `Expected ${text1}.left to equal ${flexbox}.paddingLeft`); - equal(top(text1), dipToDp(flexbox.paddingTop), `Expected ${text1}.top to equal ${flexbox}.paddingTop`); + equal(left(text1), dipToDp(flexbox.style.paddingLeft.value), `Expected ${text1}.left to equal ${flexbox}.paddingLeft`); + equal(top(text1), dipToDp(flexbox.style.paddingTop.value), `Expected ${text1}.top to equal ${flexbox}.paddingTop`); } ); @@ -516,8 +516,8 @@ export const testJustifyContent_flexEnd_withParentPadding = test( ({root, flexbox, text1, text2, text3}) => { isLeftOf(text2, text3); isLeftOf(text1, text2); - closeEnough(width(flexbox) - right(text3), dipToDp(flexbox.paddingRight)); - closeEnough(top(text3), dipToDp(flexbox.paddingTop)); + closeEnough(width(flexbox) - right(text3), dipToDp(flexbox.style.paddingRight.value)); + closeEnough(top(text3), dipToDp(flexbox.style.paddingTop.value)); } ); @@ -544,10 +544,10 @@ export const testJustifyContent_center_withParentPadding = test( ({root, flexbox, text1, text2, text3}) => { isRightOf(text2, text1); isRightOf(text3, text2); - let space = width(flexbox) - width(text1) - width(text2) - width(text3) - dipToDp(flexbox.paddingLeft) - dipToDp(flexbox.paddingRight); + let space = width(flexbox) - width(text1) - width(text2) - width(text3) - dipToDp(flexbox.style.paddingLeft.value) - dipToDp(flexbox.style.paddingRight.value); space = space / 2; - check(space - 1 <= left(text1) - dipToDp(flexbox.paddingLeft) && left(text1) - dipToDp(flexbox.paddingLeft) <= space + 1); - check(space - 1 <= width(flexbox) - right(text3) - dipToDp(flexbox.paddingRight) && width(flexbox) - right(text3) - dipToDp(flexbox.paddingRight) <= space + 1); + check(space - 1 <= left(text1) - dipToDp(flexbox.style.paddingLeft.value) && left(text1) - dipToDp(flexbox.style.paddingLeft.value) <= space + 1); + check(space - 1 <= width(flexbox) - right(text3) - dipToDp(flexbox.style.paddingRight.value) && width(flexbox) - right(text3) - dipToDp(flexbox.style.paddingRight.value) <= space + 1); } ); @@ -571,7 +571,7 @@ export const testJustifyContent_spaceBetween_withPadding = test( activity_justify_content_test, ({flexbox}) => { flexbox.justifyContent = JustifyContent.SPACE_BETWEEN; - flexbox.padding = padding; + flexbox.style.padding = padding; }, ({root, flexbox, text1, text2, text3}) => { let space = width(flexbox) - width(text1) - width(text2) - width(text3) - dipToDp(padding) * 2; @@ -608,7 +608,7 @@ export const testJustifyContent_spaceAround_withPadding = test( activity_justify_content_test, ({flexbox}) => { flexbox.justifyContent = JustifyContent.SPACE_AROUND; - flexbox.padding = padding; + flexbox.style.padding = padding; }, ({root, flexbox, text1, text2, text3}) => { let space = width(flexbox) - width(text1) - width(text2) - width(text3) - dipToDp(padding) * 2; @@ -694,7 +694,7 @@ export const testJustifyContent_spaceBetween_flexDirection_column_withPadding = ({flexbox}) => { flexbox.justifyContent = JustifyContent.SPACE_BETWEEN; flexbox.flexDirection = FlexDirection.COLUMN; - flexbox.padding = padding; + flexbox.style.padding = padding; }, ({root, flexbox, text1, text2, text3}) => { let space = height(flexbox) - height(text1) - height(text2) - height(text3) - dipToDp(padding) * 2; @@ -733,7 +733,7 @@ export const testJustifyContent_spaceAround_flexDirection_column_withPadding = t ({flexbox}) => { flexbox.justifyContent = JustifyContent.SPACE_AROUND; flexbox.flexDirection = FlexDirection.COLUMN; - flexbox.padding = padding; + flexbox.style.padding = padding; }, ({root, flexbox, text1, text2, text3}) => { let space = height(flexbox) - height(text1) - height(text2) - height(text3) - dipToDp(padding) * 2; @@ -863,14 +863,14 @@ export const testAlignContent_flexEnd_parentPadding = test( activity_align_content_test, ({flexbox}) => { flexbox.alignContent = AlignContent.FLEX_END; - flexbox.padding = "32"; + flexbox.style.padding = "32"; }, ({root, flexbox, text1, text2, text3}) => { isAbove(text1, text3); isAbove(text1, text3); isAbove(text2, text3); - closeEnough(bottom(text3), height(flexbox) - dipToDp(flexbox.paddingBottom)); + closeEnough(bottom(text3), height(flexbox) - dipToDp(flexbox.style.paddingBottom.value)); } ); @@ -879,14 +879,14 @@ export const testAlignContent_flexEnd_parentPadding_column = test( ({flexbox}) => { flexbox.alignContent = AlignContent.FLEX_END; flexbox.flexDirection = FlexDirection.COLUMN; - flexbox.padding = "32"; + flexbox.style.padding = "32"; }, ({root, flexbox, text1, text2, text3}) => { isLeftOf(text1, text3); isLeftOf(text2, text3); let { bounds1, bounds2 } = comparableBounds(text3, flexbox); - closeEnough(bounds1.right, bounds2.right - dipToDp(flexbox.paddingRight)); + closeEnough(bounds1.right, bounds2.right - dipToDp(flexbox.style.paddingRight.value)); } ); @@ -957,7 +957,7 @@ export const testAlignContent_spaceAround = test( export const testAlignContent_stretch_parentWrapContent = test( activity_align_content_test, ({flexbox}) => { - flexbox.height = Number.NaN; // TODO: Check that "NaN" is auto-ish + flexbox.height = unsetValue; // TODO: Check that "NaN" is auto-ish flexbox.verticalAlignment = "top"; }, ({root, flexbox, text1, text2, text3}) => { @@ -1091,7 +1091,7 @@ export const testAlignContent_spaceAround_flexDirection_column = test( export const testAlignContent_stretch_parentWrapContent_flexDirection_column = test( activity_align_content_test, ({flexbox}) => { - flexbox.width = Number.NaN; // TODO: Check default is Number.NaN + flexbox.width = unsetValue; // TODO: Check default is Number.NaN flexbox.horizontalAlignment = "left"; flexbox.flexDirection = FlexDirection.COLUMN; }, @@ -1249,8 +1249,8 @@ export const testAlignItems_flexEnd_parentPadding = test( ({flexbox}) => flexbox.alignItems = AlignItems.FLEX_END, ({root, flexbox, text1, text2, text3}) => { isRightOf(text2, text1); - closeEnough(bottom(text1), height(flexbox) - dipToDp(flexbox.paddingBottom)); - closeEnough(bottom(text2), height(flexbox) - dipToDp(flexbox.paddingBottom)); + closeEnough(bottom(text1), height(flexbox) - dipToDp(flexbox.style.paddingBottom.value)); + closeEnough(bottom(text2), height(flexbox) - dipToDp(flexbox.style.paddingBottom.value)); } ); @@ -1262,8 +1262,8 @@ export const testAlignItems_flexEnd_parentPadding_column = test( }, ({root, flexbox, text1, text2, text3}) => { isBelow(text2, text1); - closeEnough(right(text1), width(flexbox) - dipToDp(flexbox.paddingRight)); - closeEnough(right(text2), width(flexbox) - dipToDp(flexbox.paddingRight)); + closeEnough(right(text1), width(flexbox) - dipToDp(flexbox.style.paddingRight.value)); + closeEnough(right(text2), width(flexbox) - dipToDp(flexbox.style.paddingRight.value)); } ); @@ -1808,7 +1808,7 @@ export const testWrap_parentPadding_horizontal = test( ({flexbox, text1, text2, text3}) => { isBelow(text2, text1); isRightOf(text3, text2); - closeEnough(height(flexbox), dipToDp(flexbox.paddingTop) + dipToDp(flexbox.paddingBottom) + height(text1) + height(text2)); + closeEnough(height(flexbox), dipToDp(flexbox.style.paddingTop.value) + dipToDp(flexbox.style.paddingBottom.value) + height(text1) + height(text2)); } ); @@ -1826,7 +1826,7 @@ export const testWrap_parentPadding_vertical = test( ({flexbox, text1, text2, text3}) => { isRightOf(text2, text1); isBelow(text3, text2); - closeEnough(width(flexbox), dipToDp(flexbox.paddingLeft) + dipToDp(flexbox.paddingRight) + width(text1) + width(text2)); + closeEnough(width(flexbox), dipToDp(flexbox.style.paddingLeft.value) + dipToDp(flexbox.style.paddingRight.value) + width(text1) + width(text2)); } ); @@ -1844,7 +1844,7 @@ export const testWrap_childMargin_horizontal = test( ({flexbox, text1, text2, text3}) => { isBelow(text2, text1); isRightOf(text3, text2); - closeEnough(height(flexbox), height(text1) + height(text2) + dipToDp(text2.marginTop) + dipToDp(text2.marginBottom)); + closeEnough(height(flexbox), height(text1) + height(text2) + dipToDp(text2.style.marginTop.value) + dipToDp(text2.style.marginBottom.value)); } ); @@ -1907,7 +1907,7 @@ export const testWrap_childMargin_vertical = test( isRightOf(text2, text1); isBelow(text3, text2); // dips anyone? - closeEnough(width(flexbox), width(text1) + width(text2) + dipToDp(text2.marginLeft) + dipToDp(text2.marginRight)); + closeEnough(width(flexbox), width(text1) + width(text2) + dipToDp(text2.marginLeft.value) + dipToDp(text2.marginRight.value)); } ); diff --git a/tests/app/ui/layouts/grid-layout-tests.ts b/tests/app/ui/layouts/grid-layout-tests.ts index af2da3422..0f07e0688 100644 --- a/tests/app/ui/layouts/grid-layout-tests.ts +++ b/tests/app/ui/layouts/grid-layout-tests.ts @@ -1,14 +1,15 @@ -import {Page} from "ui/page"; -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 builder = require("ui/builder"); -import enums = require("ui/enums"); -import testModule = require("../../ui-test"); -import layoutHelper = require("./layout-helper"); -import platform = require("platform"); -import commonTests = require("./common-layout-tests"); +import { Page } from "ui/page"; +import { GridLayout, ItemSpec } from "ui/layouts/grid-layout"; +import { Button } from "ui/button"; +import * as TKUnit from "../../TKUnit"; +import * as view from "ui/core/view"; +import { unsetValue } from "ui/core/view"; +import * as builder from "ui/builder"; +import * as enums from "ui/enums"; +import * as testModule from "../../ui-test"; +import * as layoutHelper from "./layout-helper"; +import * as platform from "platform"; +import * as commonTests from "./common-layout-tests"; var DELTA = 1; @@ -51,15 +52,15 @@ export class GridLayoutTest extends testModule.UITest private prepareGridLayout(wait?: boolean) { - this.testView.addRow(new ItemSpec(1, GridUnitType.star)); - this.testView.addRow(new ItemSpec(2, GridUnitType.star)); - this.testView.addRow(new ItemSpec(layoutHelper.dp(50), GridUnitType.pixel)); - this.testView.addRow(new ItemSpec(50, GridUnitType.auto)); + this.testView.addRow(new ItemSpec(1, "star")); + this.testView.addRow(new ItemSpec(2, "star")); + this.testView.addRow(new ItemSpec(layoutHelper.dp(50), "pixel")); + this.testView.addRow(new ItemSpec(50, "auto")); - this.testView.addColumn(new ItemSpec(1, GridUnitType.star)); - this.testView.addColumn(new ItemSpec(2, GridUnitType.star)); - this.testView.addColumn(new ItemSpec(layoutHelper.dp(50), GridUnitType.pixel)); - this.testView.addColumn(new ItemSpec(50, GridUnitType.auto)); + this.testView.addColumn(new ItemSpec(1, "star")); + this.testView.addColumn(new ItemSpec(2, "star")); + this.testView.addColumn(new ItemSpec(layoutHelper.dp(50), "pixel")); + this.testView.addColumn(new ItemSpec(50, "auto")); for (var r = 0; r < 4; r++) { for (var c = 0; c < 4; c++) { @@ -68,19 +69,19 @@ export class GridLayoutTest extends testModule.UITest GridLayout.setColumn(btn, c); GridLayout.setRow(btn, r); if (c === 3) { - btn.width = layoutHelper.dp(100); // Auto column should take 100px for this test. + btn.width = { value: 100, unit: "dip" }; // Auto column should take 100px for this test. } if (r === 3) { - btn.height = layoutHelper.dp(100); // Auto row should take 100px for this test. + btn.height = { value: 100, unit: "dip" }; // Auto row should take 100px for this test. } this.testView.addChild(btn); } } - this.testView.width = layoutHelper.dp(300); - this.testView.height = layoutHelper.dp(300); + this.testView.width = { value: 300, unit: "dip" }; + this.testView.height = { value: 300, unit: "dip" }; if (wait) { this.waitUntilTestElementLayoutIsValid(); @@ -233,7 +234,7 @@ export class GridLayoutTest extends testModule.UITest } public test_measuredWidth_when_not_stretched_single_column() { - this.testView.horizontalAlignment = enums.HorizontalAlignment.center; + this.testView.horizontalAlignment = "center"; let btn = new Button(); btn.text = "A"; this.testView.addChild(btn); @@ -245,13 +246,13 @@ export class GridLayoutTest extends testModule.UITest } public test_measuredWidth_when_not_stretched_two_columns() { - this.testView.horizontalAlignment = enums.HorizontalAlignment.center; - this.testView.addColumn(new ItemSpec(layoutHelper.dp(80), GridUnitType.pixel)); - this.testView.addColumn(new ItemSpec(1, GridUnitType.star)); + this.testView.horizontalAlignment = "center"; + this.testView.addColumn(new ItemSpec(layoutHelper.dp(80), "pixel")); + this.testView.addColumn(new ItemSpec(1, "star")); let btn = new Button(); btn.text = "A"; - btn.width = layoutHelper.dp(100); + btn.width = { value: 100, unit: "dip" }; GridLayout.setColumnSpan(btn, 2); this.testView.addChild(btn); @@ -264,22 +265,22 @@ export class GridLayoutTest extends testModule.UITest } public test_measuredWidth_when_not_stretched_three_columns() { - this.testView.horizontalAlignment = enums.HorizontalAlignment.center; - this.testView.addColumn(new ItemSpec(layoutHelper.dp(80), GridUnitType.pixel)); - this.testView.addColumn(new ItemSpec(1, GridUnitType.star)); - this.testView.addColumn(new ItemSpec(1, GridUnitType.auto)); + this.testView.horizontalAlignment = "center"; + this.testView.addColumn(new ItemSpec(layoutHelper.dp(80), "pixel")); + this.testView.addColumn(new ItemSpec(1, "star")); + this.testView.addColumn(new ItemSpec(1, "auto")); for (let i = 1; i < 4; i++) { let btn = new Button(); btn.text = "A"; - btn.width = layoutHelper.dp(i * 20); + btn.width = { value: 20, unit: "dip" }; GridLayout.setColumn(btn, i - 1); this.testView.addChild(btn); } let btn = new Button(); btn.text = "B"; - btn.width = layoutHelper.dp(100); + btn.width = { value: 100, unit: "dip" }; GridLayout.setColumnSpan(btn, 3); this.testView.addChild(btn); @@ -303,21 +304,21 @@ export class GridLayoutTest extends testModule.UITest } public test_ItemSpec_actualLength_defaultValue() { - var def = new ItemSpec(1, GridUnitType.auto); + var def = new ItemSpec(1, "auto"); TKUnit.assertEqual(def.actualLength, 0, "'actualLength' property default value should be 0."); } public test_ItemSpec_constructor_throws_onNegativeValue() { TKUnit.assertThrows(() => { - return new ItemSpec(-1, GridUnitType.auto); + return new ItemSpec(-1, "auto"); }, "'value' should be positive number."); } public test_ItemSpec_constructor_doesnt_throw_onCorrectType() { try { - var dummy = new ItemSpec(1, GridUnitType.auto); - dummy = new ItemSpec(1, GridUnitType.star); - dummy = new ItemSpec(1, GridUnitType.pixel); + var dummy = new ItemSpec(1, "auto"); + dummy = new ItemSpec(1, "star"); + dummy = new ItemSpec(1, "pixel"); } catch (ex) { TKUnit.assert(false, "ItemSpec type should support auto, star and pixel."); @@ -326,13 +327,13 @@ export class GridLayoutTest extends testModule.UITest public test_ItemSpec_constructor_throws_onWrongType() { TKUnit.assertThrows(() => { - return new ItemSpec(1, "unsupported"); + return new ItemSpec(1, "unsupported"); }, "'ItemSpec type' incorrect value."); } public test_ItemSpec_auto() { - var w = new ItemSpec(1, GridUnitType.auto); - TKUnit.assertEqual(w.gridUnitType, GridUnitType.auto, "'gridUnitType' property default value should be 'auto'"); + var w = new ItemSpec(1, "auto"); + TKUnit.assertEqual(w.gridUnitType, "auto", "'gridUnitType' property default value should be 'auto'"); TKUnit.assertEqual(w.isAbsolute, false, "'isAbsolute' property default value should be 'false'"); TKUnit.assertEqual(w.isAuto, true, "'isAuto' property default value should be 'false'"); TKUnit.assertEqual(w.isStar, false, "'isAuto' property default value should be 'true'"); @@ -340,8 +341,8 @@ export class GridLayoutTest extends testModule.UITest } public test_ItemSpec_unitType_pixel() { - var w = new ItemSpec(6, GridUnitType.pixel); - TKUnit.assertEqual(w.gridUnitType, GridUnitType.pixel, "'gridUnitType' property default value should be 'pixel'"); + var w = new ItemSpec(6, "pixel"); + TKUnit.assertEqual(w.gridUnitType, "pixel", "'gridUnitType' property default value should be 'pixel'"); TKUnit.assertEqual(w.isAbsolute, true, "'isAbsolute' property default value should be 'false'"); TKUnit.assertEqual(w.isAuto, false, "'isAuto' property default value should be 'false'"); TKUnit.assertEqual(w.isStar, false, "'isAuto' property default value should be 'true'"); @@ -349,8 +350,8 @@ export class GridLayoutTest extends testModule.UITest } public test_ItemSpec_unitType() { - var w = new ItemSpec(2, GridUnitType.star); - TKUnit.assertEqual(w.gridUnitType, GridUnitType.star, "'gridUnitType' property default value should be 'star'"); + var w = new ItemSpec(2, "star"); + TKUnit.assertEqual(w.gridUnitType, "star", "'gridUnitType' property default value should be 'star'"); TKUnit.assertEqual(w.isAbsolute, false, "'isAbsolute' property default value should be 'false'"); TKUnit.assertEqual(w.isAuto, false, "'isAuto' property default value should be 'false'"); TKUnit.assertEqual(w.isStar, true, "'isAuto' property default value should be 'true'"); @@ -360,8 +361,8 @@ export class GridLayoutTest extends testModule.UITest public test_desiredSize_isCorrect() { this.prepareGridLayout(false); - this.testView.width = Number.NaN; - this.testView.height = Number.NaN; + this.testView.width = unsetValue; + this.testView.height = unsetValue; this.waitUntilTestElementLayoutIsValid(); @@ -471,17 +472,17 @@ export class GridLayoutTest extends testModule.UITest public test_ColumnWidth_when_4stars_and_width_110() { - this.testView.width = layoutHelper.dp(110); - this.testView.addColumn(new ItemSpec(1, GridUnitType.star)); - this.testView.addColumn(new ItemSpec(1, GridUnitType.star)); - this.testView.addColumn(new ItemSpec(1, GridUnitType.star)); - this.testView.addColumn(new ItemSpec(1, GridUnitType.star)); + this.testView.width = { value: 110, unit: "dip" }; + this.testView.addColumn(new ItemSpec(1, "star")); + this.testView.addColumn(new ItemSpec(1, "star")); + this.testView.addColumn(new ItemSpec(1, "star")); + this.testView.addColumn(new ItemSpec(1, "star")); this.waitUntilTestElementLayoutIsValid(); var cols = this.testView.getColumns(); - TKUnit.assertAreClose(cols[0].actualLength, Math.round(layoutHelper.dp(28)), DELTA, "Column[0] actual length should be 28"); + TKUnit.assertAreClose(cols[0].actualLength, Math.round(layoutHelper.dp(20)), DELTA, "Column[0] actual length should be 28"); TKUnit.assertAreClose(cols[1].actualLength, Math.round(layoutHelper.dp(27)), DELTA, "Column[1] actual length should be 27"); TKUnit.assertAreClose(cols[2].actualLength, Math.round(layoutHelper.dp(28)), DELTA, "Column[2] actual length should be 28"); TKUnit.assertAreClose(cols[3].actualLength, Math.round(layoutHelper.dp(27)), DELTA, "Column[3] actual length should be 27"); @@ -489,14 +490,14 @@ export class GridLayoutTest extends testModule.UITest public test_margins_and_verticalAlignment_center() { - this.testView.height = layoutHelper.dp(200); - this.testView.width = layoutHelper.dp(200); + this.testView.height = { value: 200, unit: "dip" }; + this.testView.width = { value: 200, unit: "dip" }; var btn = new layoutHelper.MyButton(); btn.text = "btn"; - btn.height = layoutHelper.dp(100); - btn.width = layoutHelper.dp(100); - btn.marginBottom = layoutHelper.dp(50); - btn.marginRight = layoutHelper.dp(50); + btn.height = { value: 100, unit: "dip" }; + btn.width = { value: 100, unit: "dip" }; + btn.marginBottom = { value: 50, unit: "dip" }; + btn.marginRight = { value: 50, unit: "dip" }; this.testView.addChild(btn); this.waitUntilTestElementLayoutIsValid(); @@ -562,13 +563,13 @@ export class GridLayoutTest extends testModule.UITest } public test_padding() { - this.testView.paddingLeft = layoutHelper.dp(10); - this.testView.paddingTop = layoutHelper.dp(20); - this.testView.paddingRight = layoutHelper.dp(30); - this.testView.paddingBottom = layoutHelper.dp(40); + this.testView.style.paddingLeft = { value: 10, unit: "dip" }; + this.testView.style.paddingTop = { value: 20, unit: "dip" }; + this.testView.style.paddingRight = { value: 30, unit: "dip" }; + this.testView.style.paddingBottom = { value: 40, unit: "dip" }; - this.testView.width = layoutHelper.dp(300); - this.testView.height = layoutHelper.dp(300); + this.testView.width = { value: 300, unit: "dip" }; + this.testView.height = { value: 300, unit: "dip" }; var btn = new layoutHelper.MyButton(); this.testView.addChild(btn); @@ -595,13 +596,13 @@ export class GridLayoutTest extends testModule.UITest gridLayout.addChild(btn3); gridLayout.addChild(btn4); // << grid-layout-addviews - + // >> grid-layout-setcolumn GridLayout.setColumn(btn1, 0); GridLayout.setColumn(btn2, 1); GridLayout.setColumn(btn3, 2); // << grid-layout-setcolumn - + // >> grid-layout-setrow GridLayout.setRow(btn4, 1); // << grid-layout-setrow @@ -613,17 +614,17 @@ export class GridLayoutTest extends testModule.UITest // >> grid-layout-itemspec // ItemSpec modes of the column refers to its width. // Absolute size of the column - var firstColumn = new ItemSpec(80, GridUnitType.pixel); + var firstColumn = new ItemSpec(80, "pixel"); // Star width means that this column will expand to fill the gap left from other columns - var secondColumn = new ItemSpec(1, GridUnitType.star); + var secondColumn = new ItemSpec(1, "star"); // Auto size means that column will expand or shrink in order to give enough place for all child UI elements. - var thirdColumn = new ItemSpec(1, GridUnitType.auto); + var thirdColumn = new ItemSpec(1, "auto"); // Star and Auto modes for rows behave like corresponding setting for columns but refer to row height. - var firstRow = new ItemSpec(1, GridUnitType.auto); - var secondRow = new ItemSpec(1, GridUnitType.star); + var firstRow = new ItemSpec(1, "auto"); + var secondRow = new ItemSpec(1, "star"); // << grid-layout-itemspec - + // >> grid-layout-add-rowscols gridLayout.addColumn(firstColumn); gridLayout.addColumn(secondColumn); @@ -638,22 +639,22 @@ export class GridLayoutTest extends testModule.UITest } public test_layout_correctnes() { - this.testView.width = layoutHelper.dp(300); - this.testView.height = layoutHelper.dp(300); + this.testView.width = { value: 300, unit: "dip" }; + this.testView.height = { value: 300, unit: "dip" }; let grid = new layoutHelper.MyGridLayout(); - grid.width = layoutHelper.dp(150); - grid.height = layoutHelper.dp(150); - grid.horizontalAlignment = enums.HorizontalAlignment.right; - grid.verticalAlignment = enums.VerticalAlignment.bottom; + grid.width = { value: 150, unit: "dip" }; + grid.height = { value: 150, unit: "dip" }; + grid.horizontalAlignment = "right"; + grid.verticalAlignment = "bottom"; this.testView.addChild(grid); let btn = new layoutHelper.MyButton(); - btn.width = layoutHelper.dp(75); - btn.height = layoutHelper.dp(75); - btn.horizontalAlignment = enums.HorizontalAlignment.left; - btn.verticalAlignment = enums.VerticalAlignment.bottom; + btn.width = { value: 75, unit: "dip" }; + btn.height = { value: 75, unit: "dip" }; + btn.horizontalAlignment = "left"; + btn.verticalAlignment = "bottom"; grid.addChild(btn); this.waitUntilTestElementLayoutIsValid(); @@ -680,25 +681,25 @@ export class GridLayoutTest extends testModule.UITest } public test_columns_widths() { - this.testView.width = layoutHelper.dp(400); - this.testView.height = layoutHelper.dp(600); + this.testView.width = { value: 400, unit: "dip" }; + this.testView.height = { value: 600, unit: "dip" }; let grid = new GridLayout(); this.testView.addChild(grid); - grid.horizontalAlignment = enums.HorizontalAlignment.left; - grid.verticalAlignment = enums.VerticalAlignment.top; - - grid.addColumn(new ItemSpec(1, GridUnitType.star)); - grid.addColumn(new ItemSpec(layoutHelper.dp(100), GridUnitType.pixel)); - grid.addColumn(new ItemSpec(2, GridUnitType.star)); - - grid.addRow(new ItemSpec(1, GridUnitType.star)); - grid.addRow(new ItemSpec(layoutHelper.dp(100), GridUnitType.pixel)); - grid.addRow(new ItemSpec(2, GridUnitType.star)); + grid.horizontalAlignment = "left"; + grid.verticalAlignment = "top"; + + grid.addColumn(new ItemSpec(1, "star")); + grid.addColumn(new ItemSpec(layoutHelper.dp(100), "pixel")); + grid.addColumn(new ItemSpec(2, "star")); + + grid.addRow(new ItemSpec(1, "star")); + grid.addRow(new ItemSpec(layoutHelper.dp(100), "pixel")); + grid.addRow(new ItemSpec(2, "star")); let btn = new Button(); - btn.width = layoutHelper.dp(300); - btn.height = layoutHelper.dp(500); + btn.width = { value: 300, unit: "dip" }; + btn.height = { value: 500, unit: "dip" }; grid.addChild(btn); GridLayout.setColumnSpan(btn, 3); GridLayout.setRowSpan(btn, 3); diff --git a/tests/app/ui/layouts/layout-helper.android.ts b/tests/app/ui/layouts/layout-helper.android.ts index 33eec9f32..ee42b6d85 100644 --- a/tests/app/ui/layouts/layout-helper.android.ts +++ b/tests/app/ui/layouts/layout-helper.android.ts @@ -2,9 +2,9 @@ import {StackLayout} from "ui/layouts/stack-layout"; import {GridLayout} from "ui/layouts/grid-layout"; -import utils = require("utils/utils"); -import TKUnit = require("../../TKUnit"); -import def = require("./layout-helper"); +import * as utils from "utils/utils"; +import * as TKUnit from "../../TKUnit"; +import * as def from "./layout-helper"; var DELTA = 0.1; diff --git a/tests/app/ui/layouts/layout-helper.ios.ts b/tests/app/ui/layouts/layout-helper.ios.ts index acb7498ad..78bdd39a7 100644 --- a/tests/app/ui/layouts/layout-helper.ios.ts +++ b/tests/app/ui/layouts/layout-helper.ios.ts @@ -1,9 +1,9 @@ import {Button} from "ui/button"; import {StackLayout} from "ui/layouts/stack-layout"; import {GridLayout} from "ui/layouts/grid-layout"; -import utils = require("utils/utils"); -import TKUnit = require("../../TKUnit"); -import def = require("./layout-helper"); +import * as utils from "utils/utils"; +import * as TKUnit from "../../TKUnit"; +import * as def from "./layout-helper"; var DELTA = 0.1; diff --git a/tests/app/ui/layouts/stack-layout-tests.ts b/tests/app/ui/layouts/stack-layout-tests.ts index 17ea8eecd..8953f30e5 100644 --- a/tests/app/ui/layouts/stack-layout-tests.ts +++ b/tests/app/ui/layouts/stack-layout-tests.ts @@ -1,12 +1,12 @@ import {StackLayout} from "ui/layouts/stack-layout"; import {Button} from "ui/button"; -import TKUnit = require("../../TKUnit"); -import helper = require("./layout-helper"); -import enums = require("ui/enums"); -import utils = require("utils/utils"); -import testModule = require("../../ui-test"); -import layoutHelper = require("./layout-helper"); -import commonTests = require("./common-layout-tests"); +import * as TKUnit from "../../TKUnit"; +import * as helper from "./layout-helper"; +import * as enums from "ui/enums"; +import * as utils from "utils/utils"; +import * as testModule from "../../ui-test"; +import * as layoutHelper from "./layout-helper"; +import * as commonTests from "./common-layout-tests"; export class StackLayoutTest extends testModule.UITest { @@ -30,7 +30,7 @@ export class StackLayoutTest extends testModule.UITest { } public test_SetWrongOrientation_ShouldThrowError() { - TKUnit.assertThrows(() => { this.rootLayout.orientation = "not_valid"; }, + TKUnit.assertThrows(() => { (this.rootLayout).orientation = "not_valid"; }, "Setting invalid value for orientation should throw exception."); } @@ -39,7 +39,7 @@ export class StackLayoutTest extends testModule.UITest { TKUnit.assertEqual(this.rootLayout.orientation, enums.Orientation.vertical, "Default orientation should be Vertical."); - this.rootLayout.orientation = enums.Orientation.horizontal; + this.rootLayout.orientation = "horizontal"; this.waitUntilTestElementLayoutIsValid(); TKUnit.assertEqual(this.rootLayout.measureCount, 2, "Orientation change should invalidate measure."); @@ -58,7 +58,7 @@ export class StackLayoutTest extends testModule.UITest { public test_ShouldMeasureWith_AtMost_OnHorizontal() { - this.rootLayout.orientation = enums.Orientation.horizontal; + this.rootLayout.orientation = "horizontal"; this.waitUntilTestElementLayoutIsValid(); @@ -70,8 +70,8 @@ export class StackLayoutTest extends testModule.UITest { public test_DesiredSize_Vertical() { - this.rootLayout.verticalAlignment = enums.VerticalAlignment.top; - this.rootLayout.horizontalAlignment = enums.HorizontalAlignment.left; + this.rootLayout.verticalAlignment = "top"; + this.rootLayout.horizontalAlignment = "left"; this.waitUntilTestElementLayoutIsValid(); @@ -81,9 +81,9 @@ export class StackLayoutTest extends testModule.UITest { public test_DesiredSize_Horizontal() { - this.rootLayout.horizontalAlignment = enums.HorizontalAlignment.left; - this.rootLayout.verticalAlignment = enums.VerticalAlignment.top; - this.rootLayout.orientation = enums.Orientation.horizontal; + this.rootLayout.horizontalAlignment = "left"; + this.rootLayout.verticalAlignment = "top"; + this.rootLayout.orientation = "horizontal"; this.waitUntilTestElementLayoutIsValid(); @@ -92,16 +92,16 @@ export class StackLayoutTest extends testModule.UITest { } public test_Padding_Vertical() { - this.rootLayout.width = layoutHelper.dp(300); - this.rootLayout.height = layoutHelper.dp(300); + this.rootLayout.width = { value: 300, unit: "px" }; + this.rootLayout.height = { value: 300, unit: "px" }; - this.rootLayout.paddingLeft = layoutHelper.dp(10); - this.rootLayout.paddingTop = layoutHelper.dp(20); - this.rootLayout.paddingRight = layoutHelper.dp(30); - this.rootLayout.paddingBottom = layoutHelper.dp(40); + this.rootLayout.style.paddingLeft = { value: 10, unit: "px" }; + this.rootLayout.style.paddingTop = { value: 20, unit: "px" }; + this.rootLayout.style.paddingRight = { value: 30, unit: "px" }; + this.rootLayout.style.paddingBottom = { value: 40, unit: "px" }; - this.btn1.height = layoutHelper.dp(50); - this.btn2.height = layoutHelper.dp(50); + this.btn1.height = { value: 50, unit: "px" }; + this.btn2.height = { value: 50, unit: "px" }; this.waitUntilTestElementLayoutIsValid(); @@ -113,17 +113,17 @@ export class StackLayoutTest extends testModule.UITest { } public test_Padding_Horizontal() { - this.rootLayout.width = layoutHelper.dp(300); - this.rootLayout.height = layoutHelper.dp(300); - this.rootLayout.orientation = enums.Orientation.horizontal; + this.rootLayout.width = { value: 300, unit: "px" }; + this.rootLayout.height = { value: 300, unit: "px" }; + this.rootLayout.orientation = "horizontal"; - this.rootLayout.paddingLeft = layoutHelper.dp(10); - this.rootLayout.paddingTop = layoutHelper.dp(20); - this.rootLayout.paddingRight = layoutHelper.dp(30); - this.rootLayout.paddingBottom = layoutHelper.dp(40); + this.rootLayout.style.paddingLeft = { value: 10, unit: "px" }; + this.rootLayout.style.paddingTop = { value: 20, unit: "px" }; + this.rootLayout.style.paddingRight = { value: 30, unit: "px" }; + this.rootLayout.style.paddingBottom = { value: 40, unit: "px" }; - this.btn1.width = layoutHelper.dp(50); - this.btn2.width = layoutHelper.dp(50); + this.btn1.width = { value: 50, unit: "px" }; + this.btn2.width = { value: 50, unit: "px" }; this.waitUntilTestElementLayoutIsValid(); @@ -182,7 +182,7 @@ export class StackLayoutTest extends testModule.UITest { // << stack-layout-remove // >> stack-layout-horizontal - stackLayout.orientation = enums.Orientation.horizontal; + stackLayout.orientation = "horizontal"; // << stack-layout-horizontal } @@ -190,12 +190,12 @@ export class StackLayoutTest extends testModule.UITest { private setup_percent(): layoutHelper.MyButton { let layout = this.testView; layout.removeChildren(); - layout.width = layoutHelper.dp(200); - layout.height = layoutHelper.dp(200); + layout.width = { value: 200, unit: "px" }; + layout.height = { value: 200, unit: "px" }; let btn = new layoutHelper.MyButton(); - btn.horizontalAlignment = enums.HorizontalAlignment.left; - btn.verticalAlignment = enums.VerticalAlignment.top; + btn.horizontalAlignment = "left"; + btn.verticalAlignment = "top"; (btn).width = "50%"; (btn).height = "50%"; btn.margin = "10%"; @@ -218,8 +218,8 @@ export class StackLayoutTest extends testModule.UITest { TKUnit.assertEqual(bounds.right, 120, "TopLeft layout RIGHT incorrect"); TKUnit.assertEqual(bounds.bottom, 120, "TopLeft layout BOTTOM incorrect"); - btn.horizontalAlignment = enums.HorizontalAlignment.center; - btn.verticalAlignment = enums.VerticalAlignment.center; + btn.horizontalAlignment = "center"; + btn.verticalAlignment = "center"; this.waitUntilTestElementLayoutIsValid(); bounds = btn._getCurrentLayoutBounds(); @@ -228,8 +228,8 @@ export class StackLayoutTest extends testModule.UITest { TKUnit.assertEqual(bounds.right, 150, "Center layout RIGHT incorrect"); TKUnit.assertEqual(bounds.bottom, 120, "Center layout BOTTOM incorrect"); - btn.horizontalAlignment = enums.HorizontalAlignment.stretch; - btn.verticalAlignment = enums.VerticalAlignment.stretch; + btn.horizontalAlignment = "stretch"; + btn.verticalAlignment = "stretch"; this.waitUntilTestElementLayoutIsValid(); bounds = btn._getCurrentLayoutBounds(); @@ -238,8 +238,8 @@ export class StackLayoutTest extends testModule.UITest { TKUnit.assertEqual(bounds.right, 150, "Stretch layout RIGHT incorrect"); TKUnit.assertEqual(bounds.bottom, 120, "Stretch layout BOTTOM incorrect"); - btn.horizontalAlignment = enums.HorizontalAlignment.right; - btn.verticalAlignment = enums.VerticalAlignment.bottom; + btn.horizontalAlignment = "right"; + btn.verticalAlignment = "bottom"; this.waitUntilTestElementLayoutIsValid(); bounds = btn._getCurrentLayoutBounds(); @@ -251,7 +251,7 @@ export class StackLayoutTest extends testModule.UITest { public test_percent_support_horizontal() { let btn = this.setup_percent(); - this.testView.orientation = enums.Orientation.horizontal; + this.testView.orientation = "horizontal"; this.waitUntilTestElementLayoutIsValid(); TKUnit.assertEqual(btn.getMeasuredWidth(), 100, "Button MeasuredWidth incorrect"); @@ -263,8 +263,8 @@ export class StackLayoutTest extends testModule.UITest { TKUnit.assertEqual(bounds.right, 120, "TopLeft layout RIGHT incorrect"); TKUnit.assertEqual(bounds.bottom, 120, "TopLeft layout BOTTOM incorrect"); - btn.horizontalAlignment = enums.HorizontalAlignment.center; - btn.verticalAlignment = enums.VerticalAlignment.center; + btn.horizontalAlignment = "center"; + btn.verticalAlignment = "center"; this.waitUntilTestElementLayoutIsValid(); bounds = btn._getCurrentLayoutBounds(); @@ -273,8 +273,8 @@ export class StackLayoutTest extends testModule.UITest { TKUnit.assertEqual(bounds.right, 120, "Center layout RIGHT incorrect"); TKUnit.assertEqual(bounds.bottom, 150, "Center layout BOTTOM incorrect"); - btn.horizontalAlignment = enums.HorizontalAlignment.stretch; - btn.verticalAlignment = enums.VerticalAlignment.stretch; + btn.horizontalAlignment = "stretch"; + btn.verticalAlignment = "stretch"; this.waitUntilTestElementLayoutIsValid(); bounds = btn._getCurrentLayoutBounds(); @@ -283,8 +283,8 @@ export class StackLayoutTest extends testModule.UITest { TKUnit.assertEqual(bounds.right, 120, "Stretch layout RIGHT incorrect"); TKUnit.assertEqual(bounds.bottom, 150, "Stretch layout BOTTOM incorrect"); - btn.horizontalAlignment = enums.HorizontalAlignment.right; - btn.verticalAlignment = enums.VerticalAlignment.bottom; + btn.horizontalAlignment = "right"; + btn.verticalAlignment = "bottom"; this.waitUntilTestElementLayoutIsValid(); bounds = btn._getCurrentLayoutBounds(); diff --git a/tests/app/ui/layouts/wrap-layout-tests.ts b/tests/app/ui/layouts/wrap-layout-tests.ts index 094766c61..2465b561c 100644 --- a/tests/app/ui/layouts/wrap-layout-tests.ts +++ b/tests/app/ui/layouts/wrap-layout-tests.ts @@ -1,15 +1,15 @@ -import TKUnit = require("../../TKUnit"); +import * as TKUnit from "../../TKUnit"; import {Label} from "ui/label"; -import layoutHelper = require("./layout-helper"); -import testModule = require("../../ui-test"); -import commonTests = require("./common-layout-tests"); +import * as layoutHelper from "./layout-helper"; +import * as testModule from "../../ui-test"; +import * as commonTests from "./common-layout-tests"; // >> wrap-layout-require -import wrapLayoutModule = require("ui/layouts/wrap-layout"); +import * as wrapLayoutModule from "ui/layouts/wrap-layout"; // << wrap-layout-require // >> wrap-layout-others -import enums = require("ui/enums"); +import * as enums from "ui/enums"; // << wrap-layout-others export class WrapLayoutTest extends testModule.UITest { @@ -19,15 +19,15 @@ export class WrapLayoutTest extends testModule.UITest> wrap-layout-orientation - wrapLayout.orientation = enums.Orientation.vertical; + wrapLayout.orientation = "vertical"; // << wrap-layout-orientation this.waitUntilTestElementLayoutIsValid(); @@ -122,9 +122,9 @@ export class WrapLayoutTest extends testModule.UITestbtn).width = "50%"; (btn).height = "50%"; btn.margin = "10%"; @@ -288,8 +288,8 @@ export class WrapLayoutTest extends testModule.UITest> article-require-listpicker-module -import listPickerModule = require("ui/list-picker"); +import * as listPickerModule from "ui/list-picker"; // << article-require-listpicker-module function _createListPicker(): listPickerModule.ListPicker { diff --git a/tests/app/ui/list-view/list-view-tests.ts b/tests/app/ui/list-view/list-view-tests.ts index 560d7a6e4..e286ba02f 100644 --- a/tests/app/ui/list-view/list-view-tests.ts +++ b/tests/app/ui/list-view/list-view-tests.ts @@ -1,22 +1,22 @@ -import testModule = require("../../ui-test"); -import TKUnit = require("../../TKUnit"); -import app = require("application"); -import observable = require("data/observable"); -import types = require("utils/types"); -import platform = require("platform"); -import utils = require("utils/utils"); +import * as testModule from "../../ui-test"; +import * as TKUnit from "../../TKUnit"; +import * as app from "application"; +import * as observable from "data/observable"; +import * as types from "utils/types"; +import * as platform from "platform"; +import * as utils from "utils/utils"; import { Label } from "ui/label"; -import helper = require("../helper"); +import * as helper from "../helper"; import { Page } from "ui/page"; import { View, KeyedTemplate } from "ui/core/view"; // >> article-require-listview-module -import listViewModule = require("ui/list-view"); +import * as listViewModule from "ui/list-view"; // << article-require-listview-module // >> article-require-modules-listview -import observableArray = require("data/observable-array"); -import labelModule = require("ui/label"); +import * as observableArray from "data/observable-array"; +import * as labelModule from "ui/label"; // << article-require-modules-listview // >> article-item-tap diff --git a/tests/app/ui/page/modal-page.ts b/tests/app/ui/page/modal-page.ts index c39d75f18..461c3757a 100644 --- a/tests/app/ui/page/modal-page.ts +++ b/tests/app/ui/page/modal-page.ts @@ -1,5 +1,5 @@ import {topmost} from "ui/frame"; -import TKUnit = require("../../TKUnit"); +import * as TKUnit from "../../TKUnit"; import {Page, ShownModallyData} from "ui/page"; export var modalPage: Page; diff --git a/tests/app/ui/page/page-tests-common.ts b/tests/app/ui/page/page-tests-common.ts index 73c6693a5..956f453da 100644 --- a/tests/app/ui/page/page-tests-common.ts +++ b/tests/app/ui/page/page-tests-common.ts @@ -1,27 +1,28 @@ // >> article-require-page-module -import pageModule = require("ui/page"); +import * as pageModule from "ui/page"; // FrameModule is needed in order to have an option to navigate to the new page. -import frameModule = require("ui/frame"); +import * as frameModule from "ui/frame"; // << article-require-page-module // >> article-set-bindingcontext function pageLoaded(args) { - let page = args.object; - page.bindingContext = { name : "Some name" }; + let page = args.object; + page.bindingContext = { name: "Some name" }; } exports.pageLoaded = pageLoaded; // << article-set-bindingcontext -import TKUnit = require("../../TKUnit"); -import labelModule = require("ui/label"); -import {StackLayout} from "ui/layouts/stack-layout"; -import helper = require("../helper"); -import view = require("ui/core/view"); -import observable = require("data/observable"); -import {Page, ShownModallyData, NavigatedData} from "ui/page"; -import {Label} from "ui/label"; -import {EventData} from "data/observable"; -import {widthProperty, heightProperty} from "ui/styling/style" -import platform = require("platform"); +import * as TKUnit from "../../TKUnit"; +import * as labelModule from "ui/label"; +import { StackLayout } from "ui/layouts/stack-layout"; +import * as helper from "../helper"; +import * as view from "ui/core/view"; +import * as observable from "data/observable"; +import { Page, ShownModallyData, NavigatedData } from "ui/page"; +import { Label } from "ui/label"; +import { EventData } from "data/observable"; +import { PercentLength } from "ui/core/view"; +import * as platform from "platform"; +import {unsetValue, Length} from "ui/core/view"; export function addLabelToPage(page: Page, text?: string) { let label = new Label(); @@ -96,7 +97,7 @@ export function test_NavigateToNewPage() { let currentPage; let topFrame = frameModule.topmost(); currentPage = topFrame.currentPage; - + let testPage: Page; let pageFactory = function (): Page { testPage = new pageModule.Page(); @@ -239,7 +240,7 @@ export function test_NavigateTo_WithBindingContext() { let pageFactory = function (): Page { testPage = new Page(); testPage.on(pageModule.Page.navigatingToEvent, function (args: NavigatedData) { - bindingContext = (args.object).bindingContext; + bindingContext = (args.object).bindingContext; }); return testPage; }; @@ -252,7 +253,7 @@ export function test_NavigateTo_WithBindingContext() { topFrame.navigate(navEntry); TKUnit.waitUntilReady(() => topFrame.currentPage !== null && topFrame.currentPage !== currentPage && testPage.isLayoutValid); helper.goBack(); - + TKUnit.assertEqual(bindingContext, navEntry.bindingContext, "The Page's bindingContext should be equal to the NavigationEntry.bindingContext property when navigating to."); } @@ -339,7 +340,7 @@ export function test_cssShouldBeAppliedToAllNestedElements() { }; helper.navigate(pageFactory); - + TKUnit.assertEqual(label.style.backgroundColor.hex, "#ff00ff00"); TKUnit.assertEqual(stackLayout.style.backgroundColor.hex, "#ffff0000"); } @@ -537,7 +538,7 @@ export function test_WhenPageIsNavigatedToItCanShowAnotherPageAsModal() { masterPage.off(Page.navigatedToEvent, navigatedToEventHandler); } -export function test_percent_width_and_height_support() { +export function test_percent_width_and_height_support() { let testPage = new Page(); testPage.id = "test_percent_width_and_height_support"; @@ -545,7 +546,7 @@ export function test_percent_width_and_height_support() { (stackLayout).width = "50%"; (stackLayout).height = "50%"; - testPage.content = stackLayout; + testPage.content = stackLayout; let pageWidth = testPage.getMeasuredWidth(); let pageHeight = testPage.getMeasuredHeight() @@ -554,14 +555,14 @@ export function test_percent_width_and_height_support() { TKUnit.assertEqual(pageHeight, Math.round(pageHeight / 2), "Current page MeasuredHeight incorrect"); //reset values. - (testPage.style)._resetValue(heightProperty); - (testPage.style)._resetValue(widthProperty); + testPage.style.height = unsetValue; + testPage.style.width = unsetValue; - TKUnit.assert(isNaN(testPage.width), "width"); - TKUnit.assert(isNaN(testPage.height), "height"); + TKUnit.assertTrue(PercentLength.equals(testPage.width, "auto")); + TKUnit.assertTrue(PercentLength.equals(testPage.height, "auto")); } -export function test_percent_margin_support() { +export function test_percent_margin_support() { let testPage = new Page(); testPage.id = "ttest_percent_margin_support"; @@ -584,10 +585,10 @@ export function test_percent_margin_support() { //reset values. testPage.margin = "0"; - TKUnit.assertEqual(testPage.marginLeft, 0, "marginLeft"); - TKUnit.assertEqual(testPage.marginTop, 0, "marginTop"); - TKUnit.assertEqual(testPage.marginRight, 0, "marginRight"); - TKUnit.assertEqual(testPage.marginBottom, 0, "marginBottom"); + TKUnit.assertTrue(PercentLength.equals(testPage.marginLeft, 0)); + TKUnit.assertTrue(PercentLength.equals(testPage.marginTop, 0)); + TKUnit.assertTrue(PercentLength.equals(testPage.marginRight, 0)); + TKUnit.assertTrue(PercentLength.equals(testPage.marginBottom, 0)); } //export function test_ModalPage_Layout_is_Correct() { diff --git a/tests/app/ui/page/page-tests.android.ts b/tests/app/ui/page/page-tests.android.ts index 18fbd83a6..73857c435 100644 --- a/tests/app/ui/page/page-tests.android.ts +++ b/tests/app/ui/page/page-tests.android.ts @@ -1,10 +1,10 @@ -import PageModule = require("ui/page"); -import TKUnit = require("../../TKUnit"); -import LabelModule = require("ui/label"); -import PageTestCommon = require("./page-tests-common"); -import helper = require("../helper"); -import frame = require("ui/frame"); -import types = require("utils/types"); +import * as PageModule from "ui/page"; +import * as TKUnit from "../../TKUnit"; +import * as LabelModule from "ui/label"; +import * as PageTestCommon from "./page-tests-common"; +import * as helper from "../helper"; +import * as frame from "ui/frame"; +import * as types from "utils/types"; global.moduleMerge(PageTestCommon, exports); diff --git a/tests/app/ui/page/page-tests.ios.ts b/tests/app/ui/page/page-tests.ios.ts index b75ffd60e..129b25302 100644 --- a/tests/app/ui/page/page-tests.ios.ts +++ b/tests/app/ui/page/page-tests.ios.ts @@ -1,11 +1,11 @@ -import PageTestCommon = require("./page-tests-common"); +import * as PageTestCommon from "./page-tests-common"; import {Page} from "ui/page"; -import TKUnit = require("../../TKUnit"); +import * as TKUnit from "../../TKUnit"; import {Label} from "ui/label"; -import helper = require("../helper"); +import * as helper from "../helper"; import {View} from "ui/core/view"; import {EventData} from "data/observable"; -import uiUtils = require("ui/utils"); +import * as uiUtils from "ui/utils"; import * as frame from "ui/frame"; global.moduleMerge(PageTestCommon, exports); diff --git a/tests/app/ui/page/test-page-module-css.ts b/tests/app/ui/page/test-page-module-css.ts index 6bfcf7c13..cccd8c8c6 100644 --- a/tests/app/ui/page/test-page-module-css.ts +++ b/tests/app/ui/page/test-page-module-css.ts @@ -1,5 +1,5 @@ -import PageModule = require("ui/page"); -import LabelModule = require("ui/label"); +import * as PageModule from "ui/page"; +import * as LabelModule from "ui/label"; export class TestPageModule extends PageModule.Page { constructor() { diff --git a/tests/app/ui/page/test-page-module.ts b/tests/app/ui/page/test-page-module.ts index 21bbc8a5f..4e28e485e 100644 --- a/tests/app/ui/page/test-page-module.ts +++ b/tests/app/ui/page/test-page-module.ts @@ -1,5 +1,5 @@ -import PageModule = require("ui/page"); -import LabelModule = require("ui/label"); +import * as PageModule from "ui/page"; +import * as LabelModule from "ui/label"; export class TestPageModule extends PageModule.Page { constructor() { diff --git a/tests/app/ui/placeholder/placeholder-tests.ts b/tests/app/ui/placeholder/placeholder-tests.ts index 0d5f47f64..a5eef60e9 100644 --- a/tests/app/ui/placeholder/placeholder-tests.ts +++ b/tests/app/ui/placeholder/placeholder-tests.ts @@ -1,13 +1,13 @@ -import TKUnit = require("../../TKUnit"); +import * as TKUnit from "../../TKUnit"; // >> article-creating-view -import platform = require("platform"); +import * as platform from "platform"; //var utils = require("utils/utils"); -import utils = require("utils/utils"); -import helper = require("../helper"); -import viewModule = require("ui/core/view"); +import * as utils from "utils/utils"; +import * as helper from "../helper"; +import * as viewModule from "ui/core/view"; // >> article-require-placeholder-module -import placeholderModule = require("ui/placeholder"); +import * as placeholderModule from "ui/placeholder"; // << article-require-placeholder-module function creatingView(args) { diff --git a/tests/app/ui/progress/progress-tests.ts b/tests/app/ui/progress/progress-tests.ts index b1c44a5c9..91bf6aecd 100644 --- a/tests/app/ui/progress/progress-tests.ts +++ b/tests/app/ui/progress/progress-tests.ts @@ -1,12 +1,12 @@ -import TKUnit = require("../../TKUnit"); -import helper = require("../helper"); -import viewModule = require("ui/core/view"); -import observable = require("data/observable"); -import color = require("color"); -import platform = require("platform"); +import * as TKUnit from "../../TKUnit"; +import * as helper from "../helper"; +import * as viewModule from "ui/core/view"; +import * as observable from "data/observable"; +import * as color from "color"; +import * as platform from "platform"; // >> article-require-progress-module -import progressModule = require("ui/progress"); +import * as progressModule from "ui/progress"; // << article-require-progress-module export function test_default_TNS_values() { diff --git a/tests/app/ui/repeater/repeater-tests.ts b/tests/app/ui/repeater/repeater-tests.ts index 21f264712..938ea9d9e 100644 --- a/tests/app/ui/repeater/repeater-tests.ts +++ b/tests/app/ui/repeater/repeater-tests.ts @@ -1,22 +1,22 @@ -import TKUnit = require("../../TKUnit"); -import app = require("application"); -import helper = require("../helper"); -import viewModule = require("ui/core/view"); -import stackLayoutModule = require("ui/layouts/stack-layout"); -import wrapLayoutModule = require("ui/layouts/wrap-layout"); -import layoutBaseModule = require("ui/layouts/layout-base"); -import fs = require("file-system"); -import pageModule = require("ui/page"); -import gestureModule = require("ui/gestures"); +import * as TKUnit from "../../TKUnit"; +import * as app from "application"; +import * as helper from "../helper"; +import * as viewModule from "ui/core/view"; +import * as stackLayoutModule from "ui/layouts/stack-layout"; +import * as wrapLayoutModule from "ui/layouts/wrap-layout"; +import * as layoutBaseModule from "ui/layouts/layout-base"; +import * as fs from "file-system"; +import * as pageModule from "ui/page"; +import * as gestureModule from "ui/gestures"; import { Label } from "ui/label"; // >> article-require-repeater-module -import repeaterModule = require("ui/repeater"); +import * as repeaterModule from "ui/repeater"; // << article-require-repeater-module // >> article-require-modules-repeater -import observableArray = require("data/observable-array"); -import labelModule = require("ui/label"); +import * as observableArray from "data/observable-array"; +import * as labelModule from "ui/label"; // << article-require-modules-repeater var ASYNC = 0.2; diff --git a/tests/app/ui/scroll-view/scroll-view-tests.ts b/tests/app/ui/scroll-view/scroll-view-tests.ts index 14ac3d7e2..59eabbdba 100644 --- a/tests/app/ui/scroll-view/scroll-view-tests.ts +++ b/tests/app/ui/scroll-view/scroll-view-tests.ts @@ -1,14 +1,14 @@ -import TKUnit = require("../../TKUnit"); -import app = require("application"); -import button = require("ui/button"); -import enums = require("ui/enums"); -import testModule = require("../../ui-test"); -import layoutHelper = require("../layouts/layout-helper"); +import * as TKUnit from "../../TKUnit"; +import * as app from "application"; +import * as button from "ui/button"; +import * as enums from "ui/enums"; +import * as testModule from "../../ui-test"; +import * as layoutHelper from "../layouts/layout-helper"; import {Page} from "ui/page"; import * as frame from "ui/frame"; // >> article-require-scrollview-module -import scrollViewModule = require("ui/scroll-view"); +import * as scrollViewModule from "ui/scroll-view"; // << article-require-scrollview-module class ScrollLayoutTest extends testModule.UITest { @@ -17,13 +17,13 @@ class ScrollLayoutTest extends testModule.UITest { let scrollView = new scrollViewModule.ScrollView(); scrollView.orientation = enums.Orientation.vertical; - scrollView.width = layoutHelper.dp(200); - scrollView.height = layoutHelper.dp(300); + scrollView.width = { value: 200, unit: "px" }; + scrollView.height = { value: 300, unit: "px" }; let btn = new button.Button(); btn.text = "test"; - btn.width = layoutHelper.dp(500); - btn.height = layoutHelper.dp(500); + btn.width = { value: 500, unit: "px" }; + btn.height = { value: 500, unit: "px" }; scrollView.content = btn; return scrollView; @@ -66,8 +66,8 @@ class ScrollLayoutTest extends testModule.UITest { } public test_scrollableHeight_vertical_orientation_when_content_is_small() { - this.testView.content.width = layoutHelper.dp(100); - this.testView.content.height = layoutHelper.dp(100); + this.testView.content.width = { value: 100, unit: "px" }; + this.testView.content.height = { value: 100, unit: "px" }; this.waitUntilTestElementLayoutIsValid(); TKUnit.assertEqual(this.testView.scrollableHeight, 0, "this.testView.scrollableHeight"); @@ -75,7 +75,7 @@ class ScrollLayoutTest extends testModule.UITest { } public test_scrollableHeight_vertical_orientation_when_content_is_big() { - this.testView.content.width = layoutHelper.dp(100); + this.testView.content.width = { value: 100, unit: "px" }; this.waitUntilTestElementLayoutIsValid(); TKUnit.assertAreClose(layoutHelper.dip(this.testView.scrollableHeight), 200, 0.4, "this.testView.scrollableHeight"); @@ -84,8 +84,8 @@ class ScrollLayoutTest extends testModule.UITest { public test_scrollableWidth_horizontal_orientation_when_content_is_small() { this.testView.orientation = enums.Orientation.horizontal; - this.testView.content.width = layoutHelper.dp(100); - this.testView.content.height = layoutHelper.dp(100); + this.testView.content.width = { value: 100, unit: "px" }; + this.testView.content.height = { value: 100, unit: "px" }; this.waitUntilTestElementLayoutIsValid(); TKUnit.assertEqual(this.testView.scrollableHeight, 0, "this.testView.scrollableHeight"); @@ -94,7 +94,7 @@ class ScrollLayoutTest extends testModule.UITest { public test_scrollableWidth_horizontal_orientation_when_content_is_big() { this.testView.orientation = enums.Orientation.horizontal; - this.testView.content.height = layoutHelper.dp(100); + this.testView.content.height = { value: 100, unit: "px" }; this.waitUntilTestElementLayoutIsValid(); TKUnit.assertEqual(this.testView.scrollableHeight, 0, "this.testView.scrollableHeight"); diff --git a/tests/app/ui/search-bar/search-bar-tests-native.android.ts b/tests/app/ui/search-bar/search-bar-tests-native.android.ts index a40519241..84cc867c4 100644 --- a/tests/app/ui/search-bar/search-bar-tests-native.android.ts +++ b/tests/app/ui/search-bar/search-bar-tests-native.android.ts @@ -1,6 +1,6 @@ -import colorModule = require("color"); -import searchBarModule = require("ui/search-bar"); -import utils = require("utils/utils"); +import * as colorModule from "color"; +import * as searchBarModule from "ui/search-bar"; +import * as utils from "utils/utils"; function getTextView(bar: android.widget.SearchView): android.widget.TextView { if (bar) { diff --git a/tests/app/ui/search-bar/search-bar-tests-native.d.ts b/tests/app/ui/search-bar/search-bar-tests-native.d.ts index 268a1587e..39541ac9f 100644 --- a/tests/app/ui/search-bar/search-bar-tests-native.d.ts +++ b/tests/app/ui/search-bar/search-bar-tests-native.d.ts @@ -1,6 +1,6 @@ //@private -import searchBarModule = require("ui/search-bar"); -import colorModule = require("color"); +import * as searchBarModule from "ui/search-bar"; +import * as colorModule from "color"; export declare function getNativeHintColor(textView: searchBarModule.SearchBar): colorModule.Color; export declare function getNativeFontSize(searchBar: searchBarModule.SearchBar): number; \ No newline at end of file diff --git a/tests/app/ui/search-bar/search-bar-tests.ts b/tests/app/ui/search-bar/search-bar-tests.ts index f5a17d3ee..4279d1508 100644 --- a/tests/app/ui/search-bar/search-bar-tests.ts +++ b/tests/app/ui/search-bar/search-bar-tests.ts @@ -1,11 +1,11 @@ -import TKUnit = require("../../TKUnit"); -import helper = require("../helper"); -import viewModule = require("ui/core/view"); -import searchBarTestsNative = require("./search-bar-tests-native"); -import colorModule = require("color"); -import observable = require("data/observable"); +import * as TKUnit from "../../TKUnit"; +import * as helper from "../helper"; +import * as viewModule from "ui/core/view"; +import * as searchBarTestsNative from "./search-bar-tests-native"; +import * as colorModule from "color"; +import * as observable from "data/observable"; // >> article-require-searchbar-module -import searchBarModule = require("ui/search-bar"); +import * as searchBarModule from "ui/search-bar"; // << article-require-searchbar-module // ### Declaring a SearchBar. diff --git a/tests/app/ui/segmented-bar/segmented-bar-tests-native.android.ts b/tests/app/ui/segmented-bar/segmented-bar-tests-native.android.ts index 5ea23d18c..d5be781c1 100644 --- a/tests/app/ui/segmented-bar/segmented-bar-tests-native.android.ts +++ b/tests/app/ui/segmented-bar/segmented-bar-tests-native.android.ts @@ -1,4 +1,4 @@ -import segmentedBarModule = require("ui/segmented-bar"); +import * as segmentedBarModule from "ui/segmented-bar"; export function getNativeItemsCount(bar: segmentedBarModule.SegmentedBar): number { return (bar.android).getTabWidget().getTabCount(); diff --git a/tests/app/ui/segmented-bar/segmented-bar-tests-native.d.ts b/tests/app/ui/segmented-bar/segmented-bar-tests-native.d.ts index 1851541dc..eca56a485 100644 --- a/tests/app/ui/segmented-bar/segmented-bar-tests-native.d.ts +++ b/tests/app/ui/segmented-bar/segmented-bar-tests-native.d.ts @@ -1,5 +1,5 @@ //@private -import segmentedBarModule = require("ui/segmented-bar"); +import * as segmentedBarModule from "ui/segmented-bar"; export declare function getNativeItemsCount(bar: segmentedBarModule.SegmentedBar): number; export declare function setNativeSelectedIndex(bar: segmentedBarModule.SegmentedBar, index: number): void; diff --git a/tests/app/ui/segmented-bar/segmented-bar-tests-native.ios.ts b/tests/app/ui/segmented-bar/segmented-bar-tests-native.ios.ts index 0e559af0e..5a574594e 100644 --- a/tests/app/ui/segmented-bar/segmented-bar-tests-native.ios.ts +++ b/tests/app/ui/segmented-bar/segmented-bar-tests-native.ios.ts @@ -1,4 +1,4 @@ -import segmentedBarModule = require("ui/segmented-bar"); +import * as segmentedBarModule from "ui/segmented-bar"; export function getNativeItemsCount(bar: segmentedBarModule.SegmentedBar): number { return (bar.ios).numberOfSegments; diff --git a/tests/app/ui/segmented-bar/segmented-bar-tests.ts b/tests/app/ui/segmented-bar/segmented-bar-tests.ts index 9660b7e24..1fbfa72c1 100644 --- a/tests/app/ui/segmented-bar/segmented-bar-tests.ts +++ b/tests/app/ui/segmented-bar/segmented-bar-tests.ts @@ -7,7 +7,7 @@ import {Observable} from "data/observable"; import {Color} from "color"; // >> article-require-segmentedbar-module -import segmentedBarModule = require("ui/segmented-bar"); +import * as segmentedBarModule from "ui/segmented-bar"; // << article-require-segmentedbar-module function _createSegmentedBar(): segmentedBarModule.SegmentedBar { diff --git a/tests/app/ui/slider/slider-tests.ts b/tests/app/ui/slider/slider-tests.ts index fcf4d2936..b3c677750 100644 --- a/tests/app/ui/slider/slider-tests.ts +++ b/tests/app/ui/slider/slider-tests.ts @@ -1,14 +1,14 @@ -import TKUnit = require("../../TKUnit"); -import helper = require("../helper"); -import viewModule = require("ui/core/view"); -import pagesModule = require("ui/page"); -import bindable = require("ui/core/bindable"); -import observable = require("data/observable"); -import color = require("color"); -import platform = require("platform"); +import * as TKUnit from "../../TKUnit"; +import * as helper from "../helper"; +import * as viewModule from "ui/core/view"; +import * as pagesModule from "ui/page"; +import * as bindable from "ui/core/bindable"; +import * as observable from "data/observable"; +import * as color from "color"; +import * as platform from "platform"; // >> article-require-slider -import sliderModule = require("ui/slider"); +import * as sliderModule from "ui/slider"; // << article-require-slider // ### Binding the Progress and Slider value properties to a observable view-model property. diff --git a/tests/app/ui/styling/style-properties-tests.ts b/tests/app/ui/styling/style-properties-tests.ts index 681822214..a02879f38 100644 --- a/tests/app/ui/styling/style-properties-tests.ts +++ b/tests/app/ui/styling/style-properties-tests.ts @@ -1,17 +1,18 @@ -import TKUnit = require("../../TKUnit"); -import helper = require("../helper"); -import buttonModule = require("ui/button"); -import labelModule = require("ui/label"); -import textFieldModule = require("ui/text-field"); -import textViewModule = require("ui/text-view"); -import stackModule = require("ui/layouts/stack-layout"); -import page = require("ui/page"); -import color = require("color"); -import observable = require("data/observable"); -import enums = require("ui/enums"); -import fontModule = require("ui/styling/font"); -import platform = require("platform"); -import viewModule = require("ui/core/view"); +import * as TKUnit from "../../TKUnit"; +import * as helper from "../helper"; +import * as buttonModule from "ui/button"; +import * as labelModule from "ui/label"; +import * as textFieldModule from "ui/text-field"; +import * as textViewModule from "ui/text-view"; +import * as stackModule from "ui/layouts/stack-layout"; +import * as page from "ui/page"; +import * as color from "color"; +import * as observable from "data/observable"; +import * as enums from "ui/enums"; +import * as fontModule from "ui/styling/font"; +import * as platform from "platform"; +import * as viewModule from "ui/core/view"; +import { Length, PercentLength } from "ui/core/view"; var testBtn: buttonModule.Button; var testPage: page.Page; @@ -452,10 +453,10 @@ function test_border_width_shorthand_property(short: string, top: number, right: var testView = new buttonModule.Button(); testView.style.borderWidth = short; - TKUnit.assertEqual(testView.style.borderTopWidth, top, "top"); - TKUnit.assertEqual(testView.style.borderRightWidth, right, "right"); - TKUnit.assertEqual(testView.style.borderBottomWidth, bottom, "bottom"); - TKUnit.assertEqual(testView.style.borderLeftWidth, left, "left"); + TKUnit.assertTrue(Length.equals(testView.style.borderTopWidth, top)); + TKUnit.assertTrue(Length.equals(testView.style.borderRightWidth, right)); + TKUnit.assertTrue(Length.equals(testView.style.borderBottomWidth, bottom)); + TKUnit.assertTrue(Length.equals(testView.style.borderLeftWidth, left)); } export function test_setting_border_radius_shorthand_property_sets_all_border_radii() { @@ -486,10 +487,10 @@ function test_margin_shorthand_property(short: string, top: number, right: numbe var testView = new buttonModule.Button(); testView.style.margin = short; - TKUnit.assertEqual(testView.style.marginTop, top, "top"); - TKUnit.assertEqual(testView.style.marginRight, right, "right"); - TKUnit.assertEqual(testView.style.marginBottom, bottom, "bottom"); - TKUnit.assertEqual(testView.style.marginLeft, left, "left"); + TKUnit.assertTrue(PercentLength.equals(testView.style.marginTop, top)); + TKUnit.assertTrue(PercentLength.equals(testView.style.marginRight, right)); + TKUnit.assertTrue(PercentLength.equals(testView.style.marginBottom, bottom)); + TKUnit.assertTrue(PercentLength.equals(testView.style.marginLeft, left)); } export function test_setting_padding_shorthand_property_sets_all_paddings() { @@ -503,10 +504,10 @@ function test_padding_shorthand_property(short: string, top: number, right: numb var testView = new buttonModule.Button(); testView.style.padding = short; - TKUnit.assertEqual(testView.style.paddingTop, top, "top"); - TKUnit.assertEqual(testView.style.paddingRight, right, "right"); - TKUnit.assertEqual(testView.style.paddingBottom, bottom, "bottom"); - TKUnit.assertEqual(testView.style.paddingLeft, left, "left"); + TKUnit.assertTrue(Length.equals(testView.style.paddingTop, top)); + TKUnit.assertTrue(Length.equals(testView.style.paddingRight, right)); + TKUnit.assertTrue(Length.equals(testView.style.paddingBottom, bottom)); + TKUnit.assertTrue(Length.equals(testView.style.paddingLeft, left)); } export function test_setting_font_shorthand_property() { @@ -538,13 +539,13 @@ export function test_setting_font_properties_sets_native_font() { fontModule.ios.registerFont(basePath + "/Roboto-Italic.ttf"); } - test_native_font(enums.FontStyle.normal, enums.FontWeight.normal); - test_native_font(enums.FontStyle.italic, enums.FontWeight.normal); - test_native_font(enums.FontStyle.normal, enums.FontWeight.bold); - test_native_font(enums.FontStyle.italic, enums.FontWeight.bold); + test_native_font("normal", "normal"); + test_native_font("italic", "normal"); + test_native_font("normal", "bold"); + test_native_font("italic", "bold"); } -function test_native_font(style: string, weight: string) { +function test_native_font(style: "normal" | "italic", weight: "100" | "200" | "300" | "normal" | "400" | "500" | "600" | "bold" | "700" | "800" | "900") { var testView = new buttonModule.Button(); var fontName = "Roboto"; var fontNameSuffix = ""; @@ -654,7 +655,7 @@ function executeTransformTest(testView: viewModule.View, androidTextFunc: (testV TKUnit.assertEqual(iOSTextFunc(testView), capitalized); } - testView.style.textTransform = enums.TextTransform.uppercase; + testView.style.textTransform = "uppercase"; if (platform.device.os === platform.platformNames.android) { TKUnit.assertEqual(androidTextFunc(testView) + "", upper); @@ -662,7 +663,7 @@ function executeTransformTest(testView: viewModule.View, androidTextFunc: (testV TKUnit.assertEqual(iOSTextFunc(testView), upper); } - testView.style.textTransform = enums.TextTransform.lowercase; + testView.style.textTransform = "lowercase"; if (platform.device.os === platform.platformNames.android) { TKUnit.assertEqual(androidTextFunc(testView) + "", lower); @@ -670,7 +671,7 @@ function executeTransformTest(testView: viewModule.View, androidTextFunc: (testV TKUnit.assertEqual(iOSTextFunc(testView), lower); } - testView.style.textTransform = enums.TextTransform.none; + testView.style.textTransform = "none"; if (platform.device.os === platform.platformNames.android) { TKUnit.assertEqual(androidTextFunc(testView) + "", initial); @@ -691,7 +692,7 @@ function iOSText(testView: viewModule.View) { export var test_setting_label_textTransform_sets_native = function () { var testView = new labelModule.Label(); testView.text = initial; - testView.style.textTransform = enums.TextTransform.capitalize; + testView.style.textTransform = "capitalize"; executeTransformTest(testView, androidText, iOSText); } @@ -699,7 +700,7 @@ export var test_setting_label_textTransform_sets_native = function () { export var test_setting_textField_textTransform_sets_native = function () { var testView = new textFieldModule.TextField(); testView.text = initial; - testView.style.textTransform = enums.TextTransform.capitalize; + testView.style.textTransform = "capitalize"; executeTransformTest(testView, androidText, iOSText); } @@ -707,7 +708,7 @@ export var test_setting_textField_textTransform_sets_native = function () { export var test_setting_textView_textTransform_sets_native = function () { var testView = new textViewModule.TextView(); testView.text = initial; - testView.style.textTransform = enums.TextTransform.capitalize; + testView.style.textTransform = "capitalize"; executeTransformTest(testView, androidText, iOSText); } @@ -715,7 +716,7 @@ export var test_setting_textView_textTransform_sets_native = function () { export var test_setting_button_textTransform_sets_native = function () { var testView = new buttonModule.Button(); testView.text = initial; - testView.style.textTransform = enums.TextTransform.capitalize; + testView.style.textTransform = "capitalize"; executeTransformTest(testView, androidText, function (v) { return (v.ios).titleForState(UIControlState.Normal); }); } @@ -723,8 +724,8 @@ export var test_setting_button_textTransform_sets_native = function () { export var test_setting_label_textTransform_and_textDecoration_sets_native = function () { var testView = new labelModule.Label(); testView.text = initial; - testView.style.textTransform = enums.TextTransform.capitalize; - testView.style.textDecoration = enums.TextDecoration.underline; + testView.style.textTransform = "capitalize"; + testView.style.textDecoration = "underline"; executeTransformTest(testView, androidText, iOSText); } @@ -732,8 +733,8 @@ export var test_setting_label_textTransform_and_textDecoration_sets_native = fun export var test_setting_textField_textTransform_and_textDecoration_sets_native = function () { var testView = new textFieldModule.TextField(); testView.text = initial; - testView.style.textTransform = enums.TextTransform.capitalize; - testView.style.textDecoration = enums.TextDecoration.underline; + testView.style.textTransform = "capitalize"; + testView.style.textDecoration = "underline"; executeTransformTest(testView, androidText, iOSText); } @@ -741,8 +742,8 @@ export var test_setting_textField_textTransform_and_textDecoration_sets_native = export var test_setting_textView_textTransform_and_textDecoration_sets_native = function () { var testView = new textViewModule.TextView(); testView.text = initial; - testView.style.textTransform = enums.TextTransform.capitalize; - testView.style.textDecoration = enums.TextDecoration.underline; + testView.style.textTransform = "capitalize"; + testView.style.textDecoration = "underline"; executeTransformTest(testView, androidText, iOSText); } @@ -750,8 +751,8 @@ export var test_setting_textView_textTransform_and_textDecoration_sets_native = export var test_setting_button_textTransform_and_textDecoration_sets_native = function () { var testView = new buttonModule.Button(); testView.text = initial; - testView.style.textTransform = enums.TextTransform.capitalize; - testView.style.textDecoration = enums.TextDecoration.underline; + testView.style.textTransform = "capitalize"; + testView.style.textDecoration = "underline"; executeTransformTest(testView, androidText, function (v) { return (v.ios).attributedTitleForState(UIControlState.Normal).string; }); } @@ -782,17 +783,19 @@ export function test_border_width() { testView.style.borderWidth = 10; TKUnit.assertEqual(testView.style.borderWidth, 10, "all"); - TKUnit.assertEqual(testView.style.borderTopWidth, 10, "top"); - TKUnit.assertEqual(testView.style.borderRightWidth, 10, "right"); - TKUnit.assertEqual(testView.style.borderBottomWidth, 10, "bottom"); - TKUnit.assertEqual(testView.style.borderLeftWidth, 10, "left"); + + TKUnit.assertTrue(Length.equals(testView.style.borderTopWidth, { value: 10, unit: "dip" })); + TKUnit.assertTrue(Length.equals(testView.style.borderRightWidth, { value: 10, unit: "dip" })); + TKUnit.assertTrue(Length.equals(testView.style.borderBottomWidth, { value: 10, unit: "dip" })); + TKUnit.assertTrue(Length.equals(testView.style.borderLeftWidth, { value: 10, unit: "dip" })); testView.style.borderWidth = "20"; TKUnit.assertEqual((testView.style.borderWidth), 20, "all"); - TKUnit.assertEqual(testView.style.borderTopWidth, 20, "top"); - TKUnit.assertEqual(testView.style.borderRightWidth, 20, "right"); - TKUnit.assertEqual(testView.style.borderBottomWidth, 20, "bottom"); - TKUnit.assertEqual(testView.style.borderLeftWidth, 20, "left"); + + TKUnit.assertTrue(Length.equals(testView.style.borderTopWidth, { value: 20, unit: "dip" })); + TKUnit.assertTrue(Length.equals(testView.style.borderRightWidth, { value: 20, unit: "dip" })); + TKUnit.assertTrue(Length.equals(testView.style.borderBottomWidth, { value: 20, unit: "dip" })); + TKUnit.assertTrue(Length.equals(testView.style.borderLeftWidth, { value: 20, unit: "dip" })); } export function test_border_radius() { diff --git a/tests/app/ui/styling/style-tests.ts b/tests/app/ui/styling/style-tests.ts index 10ba90741..2b391db31 100644 --- a/tests/app/ui/styling/style-tests.ts +++ b/tests/app/ui/styling/style-tests.ts @@ -1,18 +1,18 @@ -import TKUnit = require("../../TKUnit"); -import application = require("application"); -import buttonModule = require("ui/button"); -import labelModule = require("ui/label"); -import pageModule = require("ui/page"); -import stackModule = require("ui/layouts/stack-layout"); -import wrapModule = require("ui/layouts/wrap-layout"); -import tabViewModule = require("ui/tab-view"); -import helper = require("../../ui/helper"); -import styling = require("ui/styling"); -import types = require("utils/types"); -import viewModule = require("ui/core/view"); -import styleModule = require("ui/styling/style"); -import dependencyObservableModule = require("ui/core/dependency-observable"); +import * as TKUnit from "../../TKUnit"; +import * as application from "application"; +import * as buttonModule from "ui/button"; +import * as labelModule from "ui/label"; +import * as pageModule from "ui/page"; +import * as stackModule from "ui/layouts/stack-layout"; +import * as wrapModule from "ui/layouts/wrap-layout"; +import * as tabViewModule from "ui/tab-view"; +import * as helper from "../../ui/helper"; +import * as types from "utils/types"; +import * as viewModule from "ui/core/view"; +import * as styleModule from "ui/styling/style"; +import * as dependencyObservableModule from "ui/core/dependency-observable"; import { resolveFileNameFromUrl } from "ui/styling/style-scope"; +import { unsetValue } from "ui/core/view"; export function test_css_dataURI_is_applied_to_backgroundImageSource() { var stack = new stackModule.StackLayout(); @@ -21,7 +21,7 @@ export function test_css_dataURI_is_applied_to_backgroundImageSource() { var page = views[1]; page.css = "StackLayout { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD///l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4Ug9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC;') }"; - var value = stack.style._getValue(styleModule.backgroundInternalProperty); + var value = stack.style.backgroundInternal; TKUnit.assert(types.isDefined(value), "Style background-image not loaded correctly from data URI."); TKUnit.assert(types.isDefined(value.image), "Style background-image not loaded correctly from data URI."); @@ -144,7 +144,8 @@ export function test_setting_css() { // Basic selector tests export function test_type_selector() { let page = helper.getClearCurrentPage(); - page.style._resetValue(styling.properties.colorProperty); + + page.style.color = unsetValue; let btn: buttonModule.Button; let label: labelModule.Label; @@ -214,7 +215,7 @@ export function test_multiple_class_selector() { export function test_id_selector() { let page = helper.getClearCurrentPage(); - page.style._resetValue(styling.properties.colorProperty); + page.style.color = unsetValue; let btnWithId: buttonModule.Button; let btnWithNoId: buttonModule.Button; @@ -241,7 +242,7 @@ export function test_id_selector() { // State selector tests export function test_state_selector() { let page = helper.getClearCurrentPage(); - page.style._resetValue(styling.properties.colorProperty); + page.style.color = unsetValue; let btn: buttonModule.Button; var testStack = new stackModule.StackLayout(); page.content = testStack; @@ -256,7 +257,7 @@ export function test_state_selector() { export function test_type_and_state_selector() { let page = helper.getClearCurrentPage(); - page.style._resetValue(styling.properties.colorProperty); + page.style.color = unsetValue; var btn: buttonModule.Button; // >>article-using-state-selector @@ -274,7 +275,7 @@ export function test_type_and_state_selector() { export function test_class_and_state_selector() { let page = helper.getClearCurrentPage(); - page.style._resetValue(styling.properties.colorProperty); + page.style.color = unsetValue; let btn = new buttonModule.Button(); btn.className = "test" @@ -289,7 +290,7 @@ export function test_class_and_state_selector() { export function test_class_and_state_selector_with_multiple_classes() { let page = helper.getClearCurrentPage(); - page.style._resetValue(styling.properties.colorProperty); + page.style.color = unsetValue; let btn = new buttonModule.Button(); let testStack = new stackModule.StackLayout(); @@ -305,7 +306,7 @@ export function test_class_and_state_selector_with_multiple_classes() { export function test_id_and_state_selector() { let page = helper.getClearCurrentPage(); - page.style._resetValue(styling.properties.colorProperty); + page.style.color = unsetValue; let btn = new buttonModule.Button(); let testStack = new stackModule.StackLayout(); @@ -321,7 +322,7 @@ export function test_id_and_state_selector() { export function test_restore_original_values_when_state_is_changed() { let page = helper.getClearCurrentPage(); - page.style._resetValue(styling.properties.colorProperty); + page.style.color = unsetValue; let btn = new buttonModule.Button(); let testStack = new stackModule.StackLayout(); @@ -568,7 +569,7 @@ export function test_selector_priorities_6() { function testSelectorsPrioritiesTemplate(css: string) { let page = helper.getClearCurrentPage(); - page.style._resetValue(styling.properties.colorProperty); + page.style.color = unsetValue; let btn: buttonModule.Button; let btnWithClass: buttonModule.Button; let btnWithId: buttonModule.Button; @@ -1423,7 +1424,7 @@ export function test_CascadingClassNamesAppliesAfterPageLoad() { const stack = new stackModule.StackLayout(); const label = new labelModule.Label(); label.text = "Some text"; - label.cssClass = 'lab1'; + label.className = 'lab1'; stack.addChild(label); application.addCss(".added { background-color: red; } .added .lab1 { background-color: blue; } .lab1 { color: red}"); diff --git a/tests/app/ui/styling/value-source-tests.ts b/tests/app/ui/styling/value-source-tests.ts index 3f96a2dd0..ea1e6f69f 100644 --- a/tests/app/ui/styling/value-source-tests.ts +++ b/tests/app/ui/styling/value-source-tests.ts @@ -1,8 +1,8 @@ -import color = require("color"); -import button = require("ui/button"); -import stack = require("ui/layouts/stack-layout"); -import helper = require("../helper"); -import TKUnit = require("../../TKUnit"); +import * as color from "color"; +import * as button from "ui/button"; +import * as stack from "ui/layouts/stack-layout"; +import * as helper from "../helper"; +import * as TKUnit from "../../TKUnit"; export var test_value_Inherited_stronger_than_Default = function () { let page = helper.getCurrentPage(); diff --git a/tests/app/ui/styling/visual-state-tests.ts b/tests/app/ui/styling/visual-state-tests.ts index 8fde9f2c2..dd0b3f869 100644 --- a/tests/app/ui/styling/visual-state-tests.ts +++ b/tests/app/ui/styling/visual-state-tests.ts @@ -1,8 +1,8 @@ -import TKUnit = require("../../TKUnit"); -import view = require("ui/core/view"); -import page = require("ui/page"); -import types = require("utils/types"); -import helper = require("../helper"); +import * as TKUnit from "../../TKUnit"; +import * as view from "ui/core/view"; +import * as page from "ui/page"; +import * as types from "utils/types"; +import * as helper from "../helper"; function assertInState(view: view.View, state: string, knownStates: string[]): void { let pseudo = view.cssPseudoClasses; diff --git a/tests/app/ui/switch/switch-tests.ts b/tests/app/ui/switch/switch-tests.ts index fac26a0dc..0059dace0 100644 --- a/tests/app/ui/switch/switch-tests.ts +++ b/tests/app/ui/switch/switch-tests.ts @@ -1,12 +1,12 @@ -import TKUnit = require("../../TKUnit"); -import helper = require("../helper"); -import viewModule = require("ui/core/view"); -import bindable = require("ui/core/bindable"); -import observable = require("data/observable"); -import color = require("color"); -import platform = require("platform"); +import * as TKUnit from "../../TKUnit"; +import * as helper from "../helper"; +import * as viewModule from "ui/core/view"; +import * as bindable from "ui/core/bindable"; +import * as observable from "data/observable"; +import * as color from "color"; +import * as platform from "platform"; // >> article-require-switch -import switchModule = require("ui/switch"); +import * as switchModule from "ui/switch"; // << article-require-switch // ### Binding the Switch checked property and Button isEanbled property to a observable view-model property. diff --git a/tests/app/ui/tab-view/tab-view-navigation-tests.ts b/tests/app/ui/tab-view/tab-view-navigation-tests.ts index acdffc30c..57cf7a9c2 100644 --- a/tests/app/ui/tab-view/tab-view-navigation-tests.ts +++ b/tests/app/ui/tab-view/tab-view-navigation-tests.ts @@ -1,8 +1,8 @@ -import TKUnit = require("../../TKUnit"); -import helper = require("../helper"); +import * as TKUnit from "../../TKUnit"; +import * as helper from "../helper"; import {Label} from "ui/label"; import {StackLayout} from "ui/layouts/stack-layout"; -import frameModule = require("ui/frame"); +import * as frameModule from "ui/frame"; import {Page} from "ui/page"; import {ListView, ItemEventData} from "ui/list-view"; import {TabView, TabViewItem} from "ui/tab-view"; diff --git a/tests/app/ui/tab-view/tab-view-tests-native.android.ts b/tests/app/ui/tab-view/tab-view-tests-native.android.ts index 96fe02300..96b91805b 100644 --- a/tests/app/ui/tab-view/tab-view-tests-native.android.ts +++ b/tests/app/ui/tab-view/tab-view-tests-native.android.ts @@ -1,4 +1,4 @@ -import tabViewModule = require("ui/tab-view"); +import * as tabViewModule from "ui/tab-view"; export function getNativeTabCount(tabView: tabViewModule.TabView): number { var pagerAdapter: android.support.v4.view.PagerAdapter = (tabView)._pagerAdapter; diff --git a/tests/app/ui/tab-view/tab-view-tests-native.d.ts b/tests/app/ui/tab-view/tab-view-tests-native.d.ts index 26877b112..bb3b7a3db 100644 --- a/tests/app/ui/tab-view/tab-view-tests-native.d.ts +++ b/tests/app/ui/tab-view/tab-view-tests-native.d.ts @@ -1,5 +1,5 @@ //@private -import tabViewModule = require("ui/tab-view"); +import * as tabViewModule from "ui/tab-view"; export declare function getNativeTabCount(tabView: tabViewModule.TabView): number; export declare function selectNativeTab(tabView: tabViewModule.TabView, index: number): void; diff --git a/tests/app/ui/tab-view/tab-view-tests-native.ios.ts b/tests/app/ui/tab-view/tab-view-tests-native.ios.ts index 7c57c84b8..4848a26e9 100644 --- a/tests/app/ui/tab-view/tab-view-tests-native.ios.ts +++ b/tests/app/ui/tab-view/tab-view-tests-native.ios.ts @@ -1,4 +1,4 @@ -import tabViewModule = require("ui/tab-view"); +import * as tabViewModule from "ui/tab-view"; export function getNativeTabCount(tabView: tabViewModule.TabView): number { if (!tabView.ios.viewControllers) { diff --git a/tests/app/ui/tab-view/tab-view-tests.ts b/tests/app/ui/tab-view/tab-view-tests.ts index 36d4e32eb..287e37a24 100644 --- a/tests/app/ui/tab-view/tab-view-tests.ts +++ b/tests/app/ui/tab-view/tab-view-tests.ts @@ -1,13 +1,13 @@ -import testModule = require("../../ui-test"); -import TKUnit = require("../../TKUnit"); -import helper = require("../helper"); -import labelModule = require("ui/label"); -import stackLayoutModule = require("ui/layouts/stack-layout"); -import tabViewTestsNative = require("./tab-view-tests-native"); +import * as testModule from "../../ui-test"; +import * as TKUnit from "../../TKUnit"; +import * as helper from "../helper"; +import * as labelModule from "ui/label"; +import * as stackLayoutModule from "ui/layouts/stack-layout"; +import * as tabViewTestsNative from "./tab-view-tests-native"; // Using a TabView requires the "ui/tab-view" module. // >> article-require-tabview-module -import tabViewModule = require("ui/tab-view"); +import * as tabViewModule from "ui/tab-view"; // << article-require-tabview-module export class TabViewTest extends testModule.UITest { diff --git a/tests/app/ui/test-pages/bindingExpressions_arrayAccess_testPage.ts b/tests/app/ui/test-pages/bindingExpressions_arrayAccess_testPage.ts index 7ac8a688b..2560e91d5 100644 --- a/tests/app/ui/test-pages/bindingExpressions_arrayAccess_testPage.ts +++ b/tests/app/ui/test-pages/bindingExpressions_arrayAccess_testPage.ts @@ -1,4 +1,4 @@ -import pages = require("ui/page"); +import * as pages from "ui/page"; export function pageLoaded(args) { var strArr: string[] = ["tests", "bindings", "tests"]; diff --git a/tests/app/ui/test-pages/bindingExpressions_binaryOperators_testPage.ts b/tests/app/ui/test-pages/bindingExpressions_binaryOperators_testPage.ts index 0f5981e6b..12a175b52 100644 --- a/tests/app/ui/test-pages/bindingExpressions_binaryOperators_testPage.ts +++ b/tests/app/ui/test-pages/bindingExpressions_binaryOperators_testPage.ts @@ -1,4 +1,4 @@ -import pages = require("ui/page"); +import * as pages from "ui/page"; export function pageLoaded(args) { var page = args.object; diff --git a/tests/app/ui/test-pages/bindingExpressions_comparisonOperators_testPage.ts b/tests/app/ui/test-pages/bindingExpressions_comparisonOperators_testPage.ts index 0ab289a84..478eca5b6 100644 --- a/tests/app/ui/test-pages/bindingExpressions_comparisonOperators_testPage.ts +++ b/tests/app/ui/test-pages/bindingExpressions_comparisonOperators_testPage.ts @@ -1,4 +1,4 @@ -import pages = require("ui/page"); +import * as pages from "ui/page"; export function pageLoaded(args) { var page = args.object; diff --git a/tests/app/ui/test-pages/bindingExpressions_groupingParenthesis_testPage.ts b/tests/app/ui/test-pages/bindingExpressions_groupingParenthesis_testPage.ts index 7a25d8ad6..996130b96 100644 --- a/tests/app/ui/test-pages/bindingExpressions_groupingParenthesis_testPage.ts +++ b/tests/app/ui/test-pages/bindingExpressions_groupingParenthesis_testPage.ts @@ -1,4 +1,4 @@ -import pages = require("ui/page"); +import * as pages from "ui/page"; export function pageLoaded(args) { var page = args.object; diff --git a/tests/app/ui/test-pages/bindingExpressions_logicalComparisonOperators_testPage.ts b/tests/app/ui/test-pages/bindingExpressions_logicalComparisonOperators_testPage.ts index 66b0245ec..483c1f652 100644 --- a/tests/app/ui/test-pages/bindingExpressions_logicalComparisonOperators_testPage.ts +++ b/tests/app/ui/test-pages/bindingExpressions_logicalComparisonOperators_testPage.ts @@ -1,4 +1,4 @@ -import pages = require("ui/page"); +import * as pages from "ui/page"; export function pageLoaded(args) { var page = args.object; diff --git a/tests/app/ui/test-pages/bindingExpressions_logicalOperators_testPage.ts b/tests/app/ui/test-pages/bindingExpressions_logicalOperators_testPage.ts index 66b0245ec..483c1f652 100644 --- a/tests/app/ui/test-pages/bindingExpressions_logicalOperators_testPage.ts +++ b/tests/app/ui/test-pages/bindingExpressions_logicalOperators_testPage.ts @@ -1,4 +1,4 @@ -import pages = require("ui/page"); +import * as pages from "ui/page"; export function pageLoaded(args) { var page = args.object; diff --git a/tests/app/ui/test-pages/bindingExpressions_ternaryOperator_testPage.ts b/tests/app/ui/test-pages/bindingExpressions_ternaryOperator_testPage.ts index 2a34cbe5e..99140cc8b 100644 --- a/tests/app/ui/test-pages/bindingExpressions_ternaryOperator_testPage.ts +++ b/tests/app/ui/test-pages/bindingExpressions_ternaryOperator_testPage.ts @@ -1,4 +1,4 @@ -import pages = require("ui/page"); +import * as pages from "ui/page"; export function pageLoaded(args) { var page = args.object; diff --git a/tests/app/ui/test-pages/bindingExpressions_unaryOperators_testPage.ts b/tests/app/ui/test-pages/bindingExpressions_unaryOperators_testPage.ts index 5967032ca..dfe82e5cf 100644 --- a/tests/app/ui/test-pages/bindingExpressions_unaryOperators_testPage.ts +++ b/tests/app/ui/test-pages/bindingExpressions_unaryOperators_testPage.ts @@ -1,4 +1,4 @@ -import pages = require("ui/page"); +import * as pages from "ui/page"; export function pageLoaded(args) { var page = args.object; diff --git a/tests/app/ui/text-field/text-field-tests-native.android.ts b/tests/app/ui/text-field/text-field-tests-native.android.ts index b9551dd2f..aec90f3eb 100644 --- a/tests/app/ui/text-field/text-field-tests-native.android.ts +++ b/tests/app/ui/text-field/text-field-tests-native.android.ts @@ -1,7 +1,7 @@ -import textFieldModule = require("ui/text-field"); -import colorModule = require("color"); -import utilsModule = require("utils/utils"); -import enums = require("ui/enums"); +import * as textFieldModule from "ui/text-field"; +import * as colorModule from "color"; +import * as utilsModule from "utils/utils"; +import * as enums from "ui/enums"; export function getNativeText(textField: textFieldModule.TextField): string { return textField.android.getText().toString(); diff --git a/tests/app/ui/text-field/text-field-tests-native.d.ts b/tests/app/ui/text-field/text-field-tests-native.d.ts index 94df9a5e6..59647724f 100644 --- a/tests/app/ui/text-field/text-field-tests-native.d.ts +++ b/tests/app/ui/text-field/text-field-tests-native.d.ts @@ -1,6 +1,6 @@ //@private -import textFieldModule = require("ui/text-field"); -import colorModule = require("color"); +import * as textFieldModule from "ui/text-field"; +import * as colorModule from "color"; export declare function getNativeText(textField: textFieldModule.TextField): string; export declare function getNativeHint(textField: textFieldModule.TextField): string; diff --git a/tests/app/ui/text-field/text-field-tests-native.ios.ts b/tests/app/ui/text-field/text-field-tests-native.ios.ts index 7abd18aa7..af1d2fad1 100644 --- a/tests/app/ui/text-field/text-field-tests-native.ios.ts +++ b/tests/app/ui/text-field/text-field-tests-native.ios.ts @@ -1,7 +1,7 @@ -import textFieldModule = require("ui/text-field"); -import colorModule = require("color"); -import utilsModule = require("utils/utils"); -import enums = require("ui/enums"); +import * as textFieldModule from "ui/text-field"; +import * as colorModule from "color"; +import * as utilsModule from "utils/utils"; +import * as enums from "ui/enums"; export function getNativeText(textField: textFieldModule.TextField): string { return textField.ios.text; diff --git a/tests/app/ui/text-field/text-field-tests.ts b/tests/app/ui/text-field/text-field-tests.ts index aec9d4f72..e94d09bab 100644 --- a/tests/app/ui/text-field/text-field-tests.ts +++ b/tests/app/ui/text-field/text-field-tests.ts @@ -1,22 +1,22 @@ -import TKUnit = require("../../TKUnit"); -import helper = require("../helper"); -import viewModule = require("ui/core/view"); -import pagesModule = require("ui/page"); -import textFieldTestsNative = require("./text-field-tests-native"); -import colorModule = require("color"); -import enums = require("ui/enums"); -import platform = require("platform"); -import formattedStringModule = require("text/formatted-string"); -import spanModule = require("text/span"); +import * as TKUnit from "../../TKUnit"; +import * as helper from "../helper"; +import * as viewModule from "ui/core/view"; +import * as pagesModule from "ui/page"; +import * as textFieldTestsNative from "./text-field-tests-native"; +import * as colorModule from "color"; +import * as enums from "ui/enums"; +import * as platform from "platform"; +import * as formattedStringModule from "text/formatted-string"; +import * as spanModule from "text/span"; // >> require-textfield -import textFieldModule = require("ui/text-field"); +import * as textFieldModule from "ui/text-field"; // << require-textfield // Other frequently used modules when working with buttons include: -import bindable = require("ui/core/bindable"); +import * as bindable from "ui/core/bindable"; // >> require-observable-textfield -import observable = require("data/observable"); +import * as observable from "data/observable"; // << require-observable-textfield // ### Binding two TextFields text property to observable view-model property. @@ -224,7 +224,7 @@ export var testBindTextToBindingContext = function () { export var testTextIsUpdatedWhenUserTypes = function () { helper.buildUIAndRunTest(_createTextFieldFunc(), function (views: Array) { var textField = views[0]; - textField.updateTextTrigger = enums.UpdateTextTrigger.focusLost; + textField.updateTextTrigger = "focusLost"; var expectedValue = "Hello, world!"; textFieldTestsNative.typeTextNatively(textField, expectedValue); @@ -463,7 +463,7 @@ export var testNativeBackgroundColorFromLocal = function () { }); } -var expectedTextAlignment = enums.TextAlignment.right; +var expectedTextAlignment: "right" = "right"; export var testLocalTextAlignmentFromCss = function () { helper.buildUIAndRunTest(_createTextFieldFunc(), function (views: Array) { var view = views[0]; diff --git a/tests/app/ui/text-view/text-view-tests-native.android.ts b/tests/app/ui/text-view/text-view-tests-native.android.ts index a287a2ecd..ff3e3b0c9 100644 --- a/tests/app/ui/text-view/text-view-tests-native.android.ts +++ b/tests/app/ui/text-view/text-view-tests-native.android.ts @@ -1,7 +1,7 @@ -import textViewModule = require("ui/text-view"); -import colorModule = require("color"); -import utilsModule = require("utils/utils"); -import enums = require("ui/enums"); +import * as textViewModule from "ui/text-view"; +import * as colorModule from "color"; +import * as utilsModule from "utils/utils"; +import * as enums from "ui/enums"; export function getNativeText(textView: textViewModule.TextView): string { return textView.android.getText().toString(); diff --git a/tests/app/ui/text-view/text-view-tests-native.d.ts b/tests/app/ui/text-view/text-view-tests-native.d.ts index 6446745c2..9bb5a969e 100644 --- a/tests/app/ui/text-view/text-view-tests-native.d.ts +++ b/tests/app/ui/text-view/text-view-tests-native.d.ts @@ -1,6 +1,6 @@ //@private -import textViewModule = require("ui/text-view"); -import colorModule = require("color"); +import * as textViewModule from "ui/text-view"; +import * as colorModule from "color"; export declare function getNativeText(textView: textViewModule.TextView): string; export declare function getNativeHint(textView: textViewModule.TextView): string; diff --git a/tests/app/ui/text-view/text-view-tests-native.ios.ts b/tests/app/ui/text-view/text-view-tests-native.ios.ts index dc7402056..08970bd24 100644 --- a/tests/app/ui/text-view/text-view-tests-native.ios.ts +++ b/tests/app/ui/text-view/text-view-tests-native.ios.ts @@ -1,7 +1,7 @@ -import textViewModule = require("ui/text-view"); -import colorModule = require("color"); -import utilsModule = require("utils/utils"); -import enums = require("ui/enums"); +import * as textViewModule from "ui/text-view"; +import * as colorModule from "color"; +import * as utilsModule from "utils/utils"; +import * as enums from "ui/enums"; export function getNativeText(textView: textViewModule.TextView): string { return textView.ios.text; diff --git a/tests/app/ui/text-view/text-view-tests.ts b/tests/app/ui/text-view/text-view-tests.ts index f8a4044d9..961af9ee1 100644 --- a/tests/app/ui/text-view/text-view-tests.ts +++ b/tests/app/ui/text-view/text-view-tests.ts @@ -1,20 +1,20 @@ -import TKUnit = require("../../TKUnit"); -import helper = require("../helper"); -import viewModule = require("ui/core/view"); -import pagesModule = require("ui/page"); -import textViewTestsNative = require("./text-view-tests-native"); -import colorModule = require("color"); -import enums = require("ui/enums"); -import platform = require("platform"); +import * as TKUnit from "../../TKUnit"; +import * as helper from "../helper"; +import * as viewModule from "ui/core/view"; +import * as pagesModule from "ui/page"; +import * as textViewTestsNative from "./text-view-tests-native"; +import * as colorModule from "color"; +import * as enums from "ui/enums"; +import * as platform from "platform"; // >> require-textmodules -import textViewModule = require("ui/text-view"); +import * as textViewModule from "ui/text-view"; // << require-textmodules // Other frequently used modules when working with buttons include: -import bindable = require("ui/core/bindable"); +import * as bindable from "ui/core/bindable"; // >> require-observable-textview -import observable = require("data/observable"); +import * as observable from "data/observable"; // << require-observable-textview // >> text-view-xml @@ -146,7 +146,7 @@ export var testBindTextToBindingContext = function () { export var testTextIsUpdatedWhenUserTypes = function () { helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array) { var textView = views[0]; - textView.updateTextTrigger = enums.UpdateTextTrigger.focusLost; + textView.updateTextTrigger = "focusLost"; var expectedValue = "Hello, world!"; textViewTestsNative.typeTextNatively(textView, expectedValue); @@ -443,7 +443,7 @@ export var testNativeBackgroundColorFromLocal = function () { }); } -var expectedTextAlignment = enums.TextAlignment.right; +var expectedTextAlignment: "right" = "right"; export var testLocalTextAlignmentFromCss = function () { helper.buildUIAndRunTest(_createTextViewFunc(), function (views: Array) { var view = views[0]; diff --git a/tests/app/ui/time-picker/time-picker-tests-native.android.ts b/tests/app/ui/time-picker/time-picker-tests-native.android.ts index ce5d7459f..3608639ce 100644 --- a/tests/app/ui/time-picker/time-picker-tests-native.android.ts +++ b/tests/app/ui/time-picker/time-picker-tests-native.android.ts @@ -1,4 +1,4 @@ -import timePickerModule = require("ui/time-picker"); +import * as timePickerModule from "ui/time-picker"; export function getNativeHour(timePicker: timePickerModule.TimePicker): number { return timePicker.android.getCurrentHour().intValue(); diff --git a/tests/app/ui/time-picker/time-picker-tests-native.d.ts b/tests/app/ui/time-picker/time-picker-tests-native.d.ts index d623430a3..e2c3452c0 100644 --- a/tests/app/ui/time-picker/time-picker-tests-native.d.ts +++ b/tests/app/ui/time-picker/time-picker-tests-native.d.ts @@ -1,5 +1,5 @@ //@private -import timePickerModule = require("ui/time-picker"); +import * as timePickerModule from "ui/time-picker"; export declare function getNativeHour(timePicker: timePickerModule.TimePicker): number; export declare function getNativeMinute(timePicker: timePickerModule.TimePicker): number; diff --git a/tests/app/ui/time-picker/time-picker-tests-native.ios.ts b/tests/app/ui/time-picker/time-picker-tests-native.ios.ts index cd524f2ec..1f40ad1a1 100644 --- a/tests/app/ui/time-picker/time-picker-tests-native.ios.ts +++ b/tests/app/ui/time-picker/time-picker-tests-native.ios.ts @@ -1,4 +1,4 @@ -import timePickerModule = require("ui/time-picker"); +import * as timePickerModule from "ui/time-picker"; import * as utils from "utils/utils"; diff --git a/tests/app/ui/time-picker/time-picker-tests.ts b/tests/app/ui/time-picker/time-picker-tests.ts index d1b2c4dfe..c6a7fdcdf 100644 --- a/tests/app/ui/time-picker/time-picker-tests.ts +++ b/tests/app/ui/time-picker/time-picker-tests.ts @@ -1,11 +1,11 @@ -import TKUnit = require("../../TKUnit"); -import testModule = require("../../ui-test"); -import timePickerTestsNative = require("./time-picker-tests-native"); -import color = require("color"); -import platform = require("platform"); +import * as TKUnit from "../../TKUnit"; +import * as testModule from "../../ui-test"; +import * as timePickerTestsNative from "./time-picker-tests-native"; +import * as color from "color"; +import * as platform from "platform"; // >> require-time-picker -import timePickerModule = require("ui/time-picker"); +import * as timePickerModule from "ui/time-picker"; // << require-time-picker function assertTime(timePicker: timePickerModule.TimePicker, expectedHour: number, expectedMinute) { diff --git a/tests/app/ui/view/view-tests-common.ts b/tests/app/ui/view/view-tests-common.ts index d27638dd4..1dad165ea 100644 --- a/tests/app/ui/view/view-tests-common.ts +++ b/tests/app/ui/view/view-tests-common.ts @@ -1,20 +1,20 @@ -import TKUnit = require("../../TKUnit"); -import viewModule = require("ui/core/view"); -import frame = require("ui/frame"); -import page = require("ui/page"); -import button = require("ui/button"); -import labelModule = require("ui/label"); -import types = require("utils/types"); -import helper = require("../../ui/helper"); -import color = require("color"); -import dependensyObservable = require("ui/core/dependency-observable"); -import proxy = require("ui/core/proxy"); -import layoutModule = require("ui/layouts/layout"); -import observable = require("data/observable"); -import bindable = require("ui/core/bindable"); -import definition = require("./view-tests"); -import enums = require("ui/enums"); -import absoluteLayoutModule = require("ui/layouts/absolute-layout"); +import * as TKUnit from "../../TKUnit"; +import * as viewModule from "ui/core/view"; +import * as frame from "ui/frame"; +import * as page from "ui/page"; +import * as button from "ui/button"; +import * as labelModule from "ui/label"; +import * as types from "utils/types"; +import * as helper from "../../ui/helper"; +import * as color from "color"; +import * as dependensyObservable from "ui/core/dependency-observable"; +import * as proxy from "ui/core/proxy"; +import * as layoutModule from "ui/layouts/layout"; +import * as observable from "data/observable"; +import * as bindable from "ui/core/bindable"; +import * as definition from "./view-tests"; +import * as enums from "ui/enums"; +import * as absoluteLayoutModule from "ui/layouts/absolute-layout"; export var test_eachDescendant = function () { var test = function (views: Array) { @@ -635,16 +635,16 @@ export var testIsVisible = function () { var lbl = new labelModule.Label(); helper.buildUIAndRunTest(lbl, function (views: Array) { - TKUnit.assertEqual(lbl.visibility, enums.Visibility.visible); - TKUnit.assertEqual(lbl._isVisible, true); + TKUnit.assertEqual(lbl.visibility, "visible"); + TKUnit.assertEqual(lbl.isCollapsed, false); - lbl.visibility = enums.Visibility.collapse; - TKUnit.assertEqual(lbl.visibility, enums.Visibility.collapse); - TKUnit.assertEqual(lbl._isVisible, false); + lbl.visibility = "collapse"; + TKUnit.assertEqual(lbl.visibility, "collapse"); + TKUnit.assertEqual(lbl.isCollapsed, true); - lbl.visibility = enums.Visibility.collapsed; - TKUnit.assertEqual(lbl.visibility, enums.Visibility.collapsed); - TKUnit.assertEqual(lbl._isVisible, false); + lbl.visibility = "collapsed"; + TKUnit.assertEqual(lbl.visibility, "collapsed"); + TKUnit.assertEqual(lbl.isCollapsed, true); }); } diff --git a/tests/app/ui/view/view-tests.android.ts b/tests/app/ui/view/view-tests.android.ts index c35186fb8..8e00aa19d 100644 --- a/tests/app/ui/view/view-tests.android.ts +++ b/tests/app/ui/view/view-tests.android.ts @@ -1,13 +1,13 @@ -import TKUnit = require("../../TKUnit"); -import commonTests = require("./view-tests-common"); -import helper = require("../../ui/helper"); -import view = require("ui/core/view"); -import button = require("ui/button"); -import types = require("utils/types"); -import stack = require("ui/layouts/stack-layout"); -import labelModule = require("ui/label"); -import frame = require("ui/frame"); -import trace = require("trace"); +import * as TKUnit from "../../TKUnit"; +import * as commonTests from "./view-tests-common"; +import * as helper from "../../ui/helper"; +import * as view from "ui/core/view"; +import * as button from "ui/button"; +import * as types from "utils/types"; +import * as stack from "ui/layouts/stack-layout"; +import * as labelModule from "ui/label"; +import * as frame from "ui/frame"; +import * as trace from "trace"; import { Color } from "color"; // enable the trace, it is disabled by default trace.enable(); diff --git a/tests/app/ui/view/view-tests.d.ts b/tests/app/ui/view/view-tests.d.ts index 01ea244a7..dba7298bd 100644 --- a/tests/app/ui/view/view-tests.d.ts +++ b/tests/app/ui/view/view-tests.d.ts @@ -1,5 +1,5 @@ //@private -import view = require("ui/core/view"); +import * as view from "ui/core/view"; export declare function getUniformNativeBorderWidth(v: view.View): number; diff --git a/tests/app/ui/view/view-tests.ios.ts b/tests/app/ui/view/view-tests.ios.ts index 29cfb6463..aeb257e36 100644 --- a/tests/app/ui/view/view-tests.ios.ts +++ b/tests/app/ui/view/view-tests.ios.ts @@ -1,10 +1,10 @@ -import commonTests = require("./view-tests-common"); -import view = require("ui/core/view"); -import grid = require("ui/layouts/grid-layout"); -import color = require("color"); -import helper = require("../helper"); -import TKUnit = require("../../TKUnit"); -import button = require("ui/button"); +import * as commonTests from "./view-tests-common"; +import * as view from "ui/core/view"; +import * as grid from "ui/layouts/grid-layout"; +import * as color from "color"; +import * as helper from "../helper"; +import * as TKUnit from "../../TKUnit"; +import * as button from "ui/button"; global.moduleMerge(commonTests, exports); diff --git a/tests/app/ui/web-view/web-view-tests.ts b/tests/app/ui/web-view/web-view-tests.ts index 6e0690adc..89524d3b0 100644 --- a/tests/app/ui/web-view/web-view-tests.ts +++ b/tests/app/ui/web-view/web-view-tests.ts @@ -1,8 +1,8 @@ -import TKUnit = require("../../TKUnit"); -import testModule = require("../../ui-test"); +import * as TKUnit from "../../TKUnit"; +import * as testModule from "../../ui-test"; // >> webview-require -import webViewModule = require("ui/web-view"); +import * as webViewModule from "ui/web-view"; // << webview-require // >> declare-webview-xml @@ -45,7 +45,7 @@ export class WebViewTest extends testModule.UITest { // << (hide) }); - webView.url = "https://github.com/"; + webView.src = "https://github.com/"; // << webview-url } @@ -145,7 +145,7 @@ export class WebViewTest extends testModule.UITest { done(e); } }); - webView.url = "kofti://mnogokofti"; + webView.src = "kofti://mnogokofti"; } public testLoadUpperCaseSrc(done) { diff --git a/tests/app/weak-event-listener-tests.ts b/tests/app/weak-event-listener-tests.ts index 4da490026..9a36f52ba 100644 --- a/tests/app/weak-event-listener-tests.ts +++ b/tests/app/weak-event-listener-tests.ts @@ -1,7 +1,7 @@ -import TKUnit = require("./TKUnit"); -import observable = require("data/observable"); -import weakEvents = require("ui/core/weak-event-listener"); -import helper = require("./ui/helper"); +import * as TKUnit from "./TKUnit"; +import * as observable from "data/observable"; +import * as weakEvents from "ui/core/weak-event-listener"; +import * as helper from "./ui/helper"; class Target { public counter: number = 0; diff --git a/tests/app/xhr-tests.ts b/tests/app/xhr-tests.ts index 057b87445..0e1ec0402 100644 --- a/tests/app/xhr-tests.ts +++ b/tests/app/xhr-tests.ts @@ -1,6 +1,6 @@ /* tslint:disable:no-unused-variable */ -import TKUnit = require("./TKUnit"); -import types = require("utils/types"); +import * as TKUnit from "./TKUnit"; +import * as types from "utils/types"; export var test_XMLHttpRequest_isDefined = function () { TKUnit.assert(types.isDefined(global["XMLHttpRequest"]), "XMLHttpRequest should be defined!"); diff --git a/tests/app/xml-declaration/app.ts b/tests/app/xml-declaration/app.ts index efb5db57f..1efd5bc44 100644 --- a/tests/app/xml-declaration/app.ts +++ b/tests/app/xml-declaration/app.ts @@ -1,2 +1,2 @@ -import application = require("application"); +import * as application from "application"; application.start({ moduleName: "xml-declaration/mainPage" }); \ No newline at end of file diff --git a/tests/app/xml-declaration/mainPage.ts b/tests/app/xml-declaration/mainPage.ts index 848c14cae..bc8bd8c8a 100644 --- a/tests/app/xml-declaration/mainPage.ts +++ b/tests/app/xml-declaration/mainPage.ts @@ -1,12 +1,12 @@ -import observable = require("data/observable"); -import view = require("ui/core/view"); -import label = require("ui/label"); -import button = require("ui/button"); -import image = require("ui/image"); -import pages = require("ui/page"); -import http = require("http"); -import camera = require("camera"); -import dialogs = require("ui/dialogs"); +import * as observable from "data/observable"; +import * as view from "ui/core/view"; +import * as label from "ui/label"; +import * as button from "ui/button"; +import * as image from "ui/image"; +import * as pages from "ui/page"; +import * as http from "http"; +import * as camera from "camera"; +import * as dialogs from "ui/dialogs"; var obj = new observable.Observable(); obj.set("id", 0); diff --git a/tests/app/xml-declaration/mymodule/MyControl.ts b/tests/app/xml-declaration/mymodule/MyControl.ts index 9b8c81f9a..3a00be5d6 100644 --- a/tests/app/xml-declaration/mymodule/MyControl.ts +++ b/tests/app/xml-declaration/mymodule/MyControl.ts @@ -1,7 +1,7 @@ -import observable = require("data/observable"); -import stackLayoutModule = require("ui/layouts/stack-layout"); -import label = require("ui/label"); -import button = require("ui/button"); +import * as observable from "data/observable"; +import * as stackLayoutModule from "ui/layouts/stack-layout"; +import * as label from "ui/label"; +import * as button from "ui/button"; export class MyControl extends stackLayoutModule.StackLayout { constructor() { diff --git a/tests/app/xml-declaration/mymodulewithxml/MyControl.ts b/tests/app/xml-declaration/mymodulewithxml/MyControl.ts index 532f0f6c5..e1db543f3 100644 --- a/tests/app/xml-declaration/mymodulewithxml/MyControl.ts +++ b/tests/app/xml-declaration/mymodulewithxml/MyControl.ts @@ -1,6 +1,6 @@ -import observable = require("data/observable"); -import view = require("ui/core/view"); -import label = require("ui/label"); +import * as observable from "data/observable"; +import * as view from "ui/core/view"; +import * as label from "ui/label"; var count = 0; export function buttonTap2(args: observable.EventData) { diff --git a/tests/app/xml-declaration/xml-declaration-tests.ts b/tests/app/xml-declaration/xml-declaration-tests.ts index fa8cc2b19..32e93bd1a 100644 --- a/tests/app/xml-declaration/xml-declaration-tests.ts +++ b/tests/app/xml-declaration/xml-declaration-tests.ts @@ -1,29 +1,29 @@ -import TKUnit = require("../TKUnit"); -import view = require("ui/core/view"); -import builder = require("ui/builder"); -import buttonModule = require("ui/button"); -import switchModule = require("ui/switch"); -import searchBarModule = require("ui/search-bar"); -import textFieldModule = require("ui/text-field"); -import gridLayoutModule = require("ui/layouts/grid-layout"); -import absoluteLayoutModule = require("ui/layouts/absolute-layout"); -import types = require("utils/types"); -import fs = require("file-system"); -import observable = require("data/observable"); -import stackLayoutModule = require("ui/layouts/stack-layout"); +import * as TKUnit from "../TKUnit"; +import * as view from "ui/core/view"; +import * as builder from "ui/builder"; +import * as buttonModule from "ui/button"; +import * as switchModule from "ui/switch"; +import * as searchBarModule from "ui/search-bar"; +import * as textFieldModule from "ui/text-field"; +import * as gridLayoutModule from "ui/layouts/grid-layout"; +import * as absoluteLayoutModule from "ui/layouts/absolute-layout"; +import * as types from "utils/types"; +import * as fs from "file-system"; +import * as observable from "data/observable"; +import * as stackLayoutModule from "ui/layouts/stack-layout"; import {Label} from "ui/label"; import {Page} from "ui/page"; import {Button} from "ui/button"; import {TabView} from "ui/tab-view"; import {Observable} from "data/observable"; import {TemplateView} from "./template-builder-tests/template-view"; -import myCustomControlWithoutXml = require("./mymodule/MyControl"); -import listViewModule = require("ui/list-view"); -import helper = require("../ui/helper"); -import viewModule = require("ui/core/view"); -import platform = require("platform"); -import gesturesModule = require("ui/gestures"); -import segmentedBar = require("ui/segmented-bar"); +import * as myCustomControlWithoutXml from "./mymodule/MyControl"; +import * as listViewModule from "ui/list-view"; +import * as helper from "../ui/helper"; +import * as viewModule from "ui/core/view"; +import * as platform from "platform"; +import * as gesturesModule from "ui/gestures"; +import * as segmentedBar from "ui/segmented-bar"; import { Source } from "utils/debug"; export function test_load_IsDefined() { @@ -307,8 +307,8 @@ export function test_parse_ShouldSetCanvasAttachedProperties() { export function test_parse_ShouldParseNumberProperties() { var p = builder.parse(""); - - TKUnit.assertEqual(p.width, 100, "Expected result: 100; Actual result: " + p.width + "; type: " + typeof (p.width)); + TKUnit.assertEqual(p.width.value, 100); + TKUnit.assertEqual(p.width.unit, "dip"); }; export function test_parse_ShouldParseBooleanProperties() { diff --git a/tests/app/xml-parser-tests/xml-parser-tests.ts b/tests/app/xml-parser-tests/xml-parser-tests.ts index 6079d78a6..ce71f8e73 100644 --- a/tests/app/xml-parser-tests/xml-parser-tests.ts +++ b/tests/app/xml-parser-tests/xml-parser-tests.ts @@ -2,9 +2,9 @@ //var xmlModule = require("xml"); // << xml-module-snippet -import TKUnit = require("../TKUnit"); -import xmlModule = require("xml"); -import fs = require("file-system"); +import * as TKUnit from "../TKUnit"; +import * as xmlModule from "xml"; +import * as fs from "file-system"; export var test_XmlParser_IsDefined = function () { TKUnit.assert(typeof (xmlModule.XmlParser) !== "undefined", "Class XmlParser should be defined!"); diff --git a/tns-core-modules/application-settings/application-settings.android.ts b/tns-core-modules/application-settings/application-settings.android.ts index 3df5dd516..56c6d6408 100644 --- a/tns-core-modules/application-settings/application-settings.android.ts +++ b/tns-core-modules/application-settings/application-settings.android.ts @@ -1,5 +1,5 @@ -import common = require("./application-settings-common"); -import utils = require("utils/utils"); +import * as common from "./application-settings-common"; +import * as utils from "utils/utils"; var sharedPreferences; function ensureSharedPreferences() { diff --git a/tns-core-modules/application-settings/application-settings.ios.ts b/tns-core-modules/application-settings/application-settings.ios.ts index 1566ddbb0..9ba24ce76 100644 --- a/tns-core-modules/application-settings/application-settings.ios.ts +++ b/tns-core-modules/application-settings/application-settings.ios.ts @@ -1,4 +1,4 @@ -import Common = require("./application-settings-common"); +import * as Common from "./application-settings-common"; import * as utils from "utils/utils"; diff --git a/tns-core-modules/application/application-common.ts b/tns-core-modules/application/application-common.ts index c64952317..8740cf24e 100644 --- a/tns-core-modules/application/application-common.ts +++ b/tns-core-modules/application/application-common.ts @@ -1,6 +1,6 @@ require("globals"); -import definition = require("application"); -import observable = require("data/observable"); +import * as definition from "application"; +import * as observable from "data/observable"; // TODO: Raise event on("livesync") and attach this handler in the ui/frame module. import { NavigationEntry, reloadPage } from "ui/frame"; import { RuleSet } from "ui/styling/css-selector"; diff --git a/tns-core-modules/application/application.android.ts b/tns-core-modules/application/application.android.ts index 974349e8b..91d57b0dd 100644 --- a/tns-core-modules/application/application.android.ts +++ b/tns-core-modules/application/application.android.ts @@ -1,7 +1,7 @@ -import appModule = require("./application-common"); -import definition = require("application"); -import frame = require("ui/frame"); -import observable = require("data/observable"); +import * as appModule from "./application-common"; +import * as definition from "application"; +import * as frame from "ui/frame"; +import * as observable from "data/observable"; import * as typesModule from "utils/types"; global.moduleMerge(appModule, exports); @@ -337,5 +337,5 @@ global.__onUncaughtError = function (error: definition.NativeScriptError) { typedExports.onUncaughtError(error); } - typedExports.notify({ eventName: typedExports.uncaughtErrorEvent, object: appModule.android, android: error }); + typedExports.notify({ eventName: typedExports.uncaughtErrorEvent, object: appModule.android, android: error, error }); }; diff --git a/tns-core-modules/application/application.d.ts b/tns-core-modules/application/application.d.ts index 70dc80b18..0063f025b 100644 --- a/tns-core-modules/application/application.d.ts +++ b/tns-core-modules/application/application.d.ts @@ -95,6 +95,15 @@ declare module "application" { */ newValue: "portrait" | "landscape" | "unknown"; } + + /** + * Event data containing information about unhandled application errors. + */ + export interface UnhandledErrorEventData extends ApplicationEventData { + ios?: NativeScriptError; + android?: NativeScriptError; + error: NativeScriptError; + } /** * The main page path (without the file extension) for the application starting from the application root. diff --git a/tns-core-modules/application/application.ios.ts b/tns-core-modules/application/application.ios.ts index c2746af0d..b895875c2 100644 --- a/tns-core-modules/application/application.ios.ts +++ b/tns-core-modules/application/application.ios.ts @@ -1,6 +1,6 @@ -import common = require("./application-common"); +import * as common from "./application-common"; import {Frame, NavigationEntry} from "ui/frame"; -import definition = require("application"); +import * as definition from "application"; import * as uiUtils from "ui/utils"; import * as typesModule from "utils/types"; import * as utils from "utils/utils"; @@ -222,7 +222,7 @@ global.__onUncaughtError = function (error: definition.NativeScriptError) { typedExports.onUncaughtError(error); } - typedExports.notify({ eventName: typedExports.uncaughtErrorEvent, object: typedExports.ios, ios: error }); + typedExports.notify({ eventName: typedExports.uncaughtErrorEvent, object: typedExports.ios, ios: error, error }); } function loadCss() { diff --git a/tns-core-modules/camera/camera.d.ts b/tns-core-modules/camera/camera.d.ts index adc4ca917..8c0f91413 100644 --- a/tns-core-modules/camera/camera.d.ts +++ b/tns-core-modules/camera/camera.d.ts @@ -3,7 +3,7 @@ */ declare module "camera" { - import imageSource = require("image-source"); + import * as imageSource from "image-source"; /** * [Deprecated. Please use same functionality from `nativescript-camera` npm module] diff --git a/tns-core-modules/camera/camera.ios.ts b/tns-core-modules/camera/camera.ios.ts index c76e927bd..acdd59d95 100644 --- a/tns-core-modules/camera/camera.ios.ts +++ b/tns-core-modules/camera/camera.ios.ts @@ -1,4 +1,4 @@ -import types = require("utils/types"); +import * as types from "utils/types"; import * as cameraCommonModule from "./camera-common"; import * as imageSourceModule from "image-source"; import * as frameModule from "ui/frame"; diff --git a/tns-core-modules/color/color-common.ts b/tns-core-modules/color/color-common.ts index b601d99a3..f7b3c06ba 100644 --- a/tns-core-modules/color/color-common.ts +++ b/tns-core-modules/color/color-common.ts @@ -1,6 +1,6 @@ -import definition = require("color"); -import types = require("utils/types"); -import knownColors = require("color/known-colors"); +import * as definition from "color"; +import * as types from "utils/types"; +import * as knownColors from "color/known-colors"; var AMP = "#"; var HEX_REGEX = /(^#[0-9A-F]{6}$)|(^#[0-9A-F]{3}$)|(^#[0-9A-F]{8}$)/i; diff --git a/tns-core-modules/color/color.android.ts b/tns-core-modules/color/color.android.ts index ac635303f..6039a728a 100644 --- a/tns-core-modules/color/color.android.ts +++ b/tns-core-modules/color/color.android.ts @@ -1,4 +1,4 @@ -import common = require("./color-common"); +import * as common from "./color-common"; export class Color extends common.Color { get android(): number { diff --git a/tns-core-modules/color/color.ios.ts b/tns-core-modules/color/color.ios.ts index 4941ba25c..123867bfe 100644 --- a/tns-core-modules/color/color.ios.ts +++ b/tns-core-modules/color/color.ios.ts @@ -1,4 +1,4 @@ -import common = require("./color-common"); +import * as common from "./color-common"; var AMP = "#"; diff --git a/tns-core-modules/connectivity/connectivity.android.ts b/tns-core-modules/connectivity/connectivity.android.ts index 3e4401630..b01f30e09 100644 --- a/tns-core-modules/connectivity/connectivity.android.ts +++ b/tns-core-modules/connectivity/connectivity.android.ts @@ -1,6 +1,6 @@ -import appModule = require("application"); -import common = require("./connectivity-common"); -import utils = require("utils/utils"); +import * as appModule from "application"; +import * as common from "./connectivity-common"; +import * as utils from "utils/utils"; global.moduleMerge(common, exports); diff --git a/tns-core-modules/connectivity/connectivity.ios.ts b/tns-core-modules/connectivity/connectivity.ios.ts index 5eb0c88f9..5c55ac82d 100644 --- a/tns-core-modules/connectivity/connectivity.ios.ts +++ b/tns-core-modules/connectivity/connectivity.ios.ts @@ -1,4 +1,4 @@ -import common = require("./connectivity-common"); +import * as common from "./connectivity-common"; global.moduleMerge(common, exports); diff --git a/tns-core-modules/console/console.ts b/tns-core-modules/console/console.ts index 7d3748c27..2a2dcb624 100644 --- a/tns-core-modules/console/console.ts +++ b/tns-core-modules/console/console.ts @@ -1,6 +1,6 @@ -import definition = require("console"); -import trace = require("trace"); -import platform = require("platform"); +import * as definition from "console"; +import * as trace from "trace"; +import * as platform from "platform"; export class Console implements definition.Console { private TAG: string = "JS"; diff --git a/tns-core-modules/css-value/index.js b/tns-core-modules/css-value/index.js index 3c6c49698..ceb8f51b7 100644 --- a/tns-core-modules/css-value/index.js +++ b/tns-core-modules/css-value/index.js @@ -1,5 +1,5 @@ -module.exports = parse; +exports.parse = parse; function parse(str) { return new Parser(str).parse(); diff --git a/tns-core-modules/css-value/reworkcss-value.d.ts b/tns-core-modules/css-value/reworkcss-value.d.ts index 77b322491..2b9753abd 100644 --- a/tns-core-modules/css-value/reworkcss-value.d.ts +++ b/tns-core-modules/css-value/reworkcss-value.d.ts @@ -6,6 +6,5 @@ declare module "css-value" { value?: number; } - function parse(cssValue: string): Array; - export = parse; + export function parse(cssValue: string): Array; } diff --git a/tns-core-modules/data/observable-array/observable-array.d.ts b/tns-core-modules/data/observable-array/observable-array.d.ts index 86820886f..08a4811e2 100644 --- a/tns-core-modules/data/observable-array/observable-array.d.ts +++ b/tns-core-modules/data/observable-array/observable-array.d.ts @@ -4,7 +4,7 @@ * Contains the ObservableArray class, which is capable of detecting and responding to changes of a collection of objects. */ declare module "data/observable-array" { - import observable = require("data/observable"); + import * as observable from "data/observable"; /** * Event args for "changed" event. diff --git a/tns-core-modules/data/observable-array/observable-array.ts b/tns-core-modules/data/observable-array/observable-array.ts index cc50bc6fc..34046057b 100644 --- a/tns-core-modules/data/observable-array/observable-array.ts +++ b/tns-core-modules/data/observable-array/observable-array.ts @@ -1,6 +1,6 @@ -import observable = require("data/observable"); -import observableArrayDef = require("data/observable-array"); -import types = require("utils/types"); +import * as observable from "data/observable"; +import * as observableArrayDef from "data/observable-array"; +import * as types from "utils/types"; export class ChangeType implements observableArrayDef.ChangeType { static Add = "add"; diff --git a/tns-core-modules/data/observable/observable.ts b/tns-core-modules/data/observable/observable.ts index dcf6badac..c10deec86 100644 --- a/tns-core-modules/data/observable/observable.ts +++ b/tns-core-modules/data/observable/observable.ts @@ -1,5 +1,5 @@ -import types = require("utils/types"); -import definition = require("data/observable"); +import * as types from "utils/types"; +import * as definition from "data/observable"; interface ListenerEntry { callback: (data: definition.EventData) => void; diff --git a/tns-core-modules/data/virtual-array/virtual-array.d.ts b/tns-core-modules/data/virtual-array/virtual-array.d.ts index 92e032212..fd729c3ce 100644 --- a/tns-core-modules/data/virtual-array/virtual-array.d.ts +++ b/tns-core-modules/data/virtual-array/virtual-array.d.ts @@ -2,8 +2,8 @@ * Contains the VirtualArray class, which is an advanced array like class that helps loading items on demand. */ declare module "data/virtual-array" { - import observable = require("data/observable"); - import observableArray = require("data/observable-array"); + import * as observable from "data/observable"; + import * as observableArray from "data/observable-array"; /** * Provides event args for "changed" event. diff --git a/tns-core-modules/data/virtual-array/virtual-array.ts b/tns-core-modules/data/virtual-array/virtual-array.ts index b69660c32..005113d94 100644 --- a/tns-core-modules/data/virtual-array/virtual-array.ts +++ b/tns-core-modules/data/virtual-array/virtual-array.ts @@ -1,6 +1,6 @@ -import observable = require("data/observable"); -import types = require("utils/types"); -import virtualArrayDef = require("data/virtual-array"); +import * as observable from "data/observable"; +import * as types from "utils/types"; +import * as virtualArrayDef from "data/virtual-array"; var CHANGE = "change", UPDATE = "update", DELETE = "delete", ADD = "add"; diff --git a/tns-core-modules/file-system/file-name-resolver.ts b/tns-core-modules/file-system/file-name-resolver.ts index 1f7ca0e7e..cb5f5693c 100644 --- a/tns-core-modules/file-system/file-name-resolver.ts +++ b/tns-core-modules/file-system/file-name-resolver.ts @@ -1,8 +1,8 @@ -import definition = require("file-system/file-name-resolver"); -import fs = require("file-system"); -import types = require("utils/types"); -import trace = require("trace"); -import platform = require("platform"); +import * as definition from "file-system/file-name-resolver"; +import * as fs from "file-system"; +import * as types from "utils/types"; +import * as trace from "trace"; +import * as platform from "platform"; import * as appModule from "application"; var MIN_WH: string = "minWH"; diff --git a/tns-core-modules/file-system/file-system-access.android.ts b/tns-core-modules/file-system/file-system-access.android.ts index c5b5fc802..56332f303 100644 --- a/tns-core-modules/file-system/file-system-access.android.ts +++ b/tns-core-modules/file-system/file-system-access.android.ts @@ -1,5 +1,5 @@ -import textModule = require("text"); -import utils = require("utils/utils"); +import * as textModule from "text"; +import * as utils from "utils/utils"; import * as typesModule from "utils/types"; export class FileSystemAccess { diff --git a/tns-core-modules/file-system/file-system-access.ios.ts b/tns-core-modules/file-system/file-system-access.ios.ts index c70168601..f4e82bf0a 100644 --- a/tns-core-modules/file-system/file-system-access.ios.ts +++ b/tns-core-modules/file-system/file-system-access.ios.ts @@ -1,4 +1,4 @@ -import textModule = require("text"); +import * as textModule from "text"; import * as utilsModule from "utils/utils"; import * as utils from "utils/utils"; diff --git a/tns-core-modules/file-system/file-system.ts b/tns-core-modules/file-system/file-system.ts index ca18f4187..65d0b4773 100644 --- a/tns-core-modules/file-system/file-system.ts +++ b/tns-core-modules/file-system/file-system.ts @@ -1,4 +1,4 @@ -import file_access_module = require("file-system/file-system-access"); +import * as file_access_module from "file-system/file-system-access"; import * as platformModule from "platform"; // The FileSystemAccess implementation, used through all the APIs. diff --git a/tns-core-modules/fps-meter/fps-meter.ts b/tns-core-modules/fps-meter/fps-meter.ts index 8fc2e8011..27150ad83 100644 --- a/tns-core-modules/fps-meter/fps-meter.ts +++ b/tns-core-modules/fps-meter/fps-meter.ts @@ -1,4 +1,4 @@ -import fpsNative = require("fps-meter/fps-native"); +import * as fpsNative from "fps-meter/fps-native"; const callbacks = {}; let idCounter = 0; diff --git a/tns-core-modules/fps-meter/fps-native.android.ts b/tns-core-modules/fps-meter/fps-native.android.ts index ad8421b0f..f8f425073 100644 --- a/tns-core-modules/fps-meter/fps-native.android.ts +++ b/tns-core-modules/fps-meter/fps-native.android.ts @@ -1,4 +1,4 @@ -import definition = require("fps-meter/fps-native"); +import * as definition from "fps-meter/fps-native"; export class FPSCallback implements definition.FPSCallback { private impl: android.view.Choreographer.FrameCallback; diff --git a/tns-core-modules/fps-meter/fps-native.ios.ts b/tns-core-modules/fps-meter/fps-native.ios.ts index ca91c4ced..5ef56f27d 100644 --- a/tns-core-modules/fps-meter/fps-native.ios.ts +++ b/tns-core-modules/fps-meter/fps-native.ios.ts @@ -1,4 +1,4 @@ -import definition = require("fps-meter/fps-native"); +import * as definition from "fps-meter/fps-native"; import * as utils from "utils/utils"; diff --git a/tns-core-modules/globals/globals.ts b/tns-core-modules/globals/globals.ts index 7a46cde14..6998809bf 100644 --- a/tns-core-modules/globals/globals.ts +++ b/tns-core-modules/globals/globals.ts @@ -121,8 +121,8 @@ if (global.__snapshot) { registerOnGlobalContext("fetch", "fetch"); } -import platform = require("platform"); -import consoleModule = require("console"); +import * as platform from "platform"; +import * as consoleModule from "console"; var c = new consoleModule.Console(); diff --git a/tns-core-modules/http/http-request.android.ts b/tns-core-modules/http/http-request.android.ts index e85bc5cda..1842cfe77 100644 --- a/tns-core-modules/http/http-request.android.ts +++ b/tns-core-modules/http/http-request.android.ts @@ -1,14 +1,14 @@ /** * Android specific http request implementation. */ -import types = require("utils/types"); +import * as types from "utils/types"; import * as utilsModule from "utils/utils"; import * as imageSourceModule from "image-source"; import * as platformModule from "platform"; import * as fsModule from "file-system"; // this is imported for definition purposes only -import http = require("http"); +import * as http from "http"; var requestIdCounter = 0; var pendingRequests = {}; diff --git a/tns-core-modules/http/http-request.d.ts b/tns-core-modules/http/http-request.d.ts index 14f6afdce..3d68c3b22 100644 --- a/tns-core-modules/http/http-request.d.ts +++ b/tns-core-modules/http/http-request.d.ts @@ -1,6 +1,6 @@ //@private declare module "http/http-request" { - import http = require("http"); + import * as http from "http"; export var request: (options: http.HttpRequestOptions) => Promise; } diff --git a/tns-core-modules/http/http-request.ios.ts b/tns-core-modules/http/http-request.ios.ts index 8417b68c0..762c52da1 100644 --- a/tns-core-modules/http/http-request.ios.ts +++ b/tns-core-modules/http/http-request.ios.ts @@ -2,7 +2,7 @@ * iOS specific http request implementation. */ -import http = require("http"); +import * as http from "http"; import * as types from "utils/types"; import * as imageSourceModule from "image-source"; @@ -11,7 +11,7 @@ import * as fsModule from "file-system"; import * as utils from "utils/utils"; import getter = utils.ios.getter; -import domainDebugger = require("./../debugger/debugger"); +import * as domainDebugger from "./../debugger/debugger"; var device = utils.ios.getter(UIDevice, UIDevice.currentDevice).userInterfaceIdiom === UIUserInterfaceIdiom.Phone ? "Phone" : "Pad"; diff --git a/tns-core-modules/http/http.d.ts b/tns-core-modules/http/http.d.ts index 097d01ff5..8048ab6fa 100644 --- a/tns-core-modules/http/http.d.ts +++ b/tns-core-modules/http/http.d.ts @@ -2,8 +2,8 @@ * Allows you to send web requests and receive the responses. */ declare module "http" { - import image = require("image-source"); - import fs = require("file-system"); + import * as image from "image-source"; + import * as fs from "file-system"; /** * Downloads the content from the specified URL as a string. diff --git a/tns-core-modules/http/http.ts b/tns-core-modules/http/http.ts index e4c7cd4a1..3a00e60ce 100644 --- a/tns-core-modules/http/http.ts +++ b/tns-core-modules/http/http.ts @@ -1,6 +1,6 @@ -import image = require("image-source"); -import httpRequest = require("http/http-request"); -import dts = require("http"); +import * as image from "image-source"; +import * as httpRequest from "http/http-request"; +import * as dts from "http"; global.moduleMerge(httpRequest, exports); diff --git a/tns-core-modules/image-asset/image-asset-common.ts b/tns-core-modules/image-asset/image-asset-common.ts index 3adc7772a..c90f7957f 100644 --- a/tns-core-modules/image-asset/image-asset-common.ts +++ b/tns-core-modules/image-asset/image-asset-common.ts @@ -1,6 +1,6 @@ -import definition = require("image-asset"); -import observable = require("data/observable"); -import platform = require("platform"); +import * as definition from "image-asset"; +import * as observable from "data/observable"; +import * as platform from "platform"; export class ImageAsset extends observable.Observable implements definition.ImageAsset { private _options: definition.ImageAssetOptions; diff --git a/tns-core-modules/image-asset/image-asset.android.ts b/tns-core-modules/image-asset/image-asset.android.ts index 2db9f412c..5aa630e7d 100644 --- a/tns-core-modules/image-asset/image-asset.android.ts +++ b/tns-core-modules/image-asset/image-asset.android.ts @@ -1,5 +1,5 @@ import * as platform from "platform"; -import common = require("./image-asset-common"); +import * as common from "./image-asset-common"; global.moduleMerge(common, exports); diff --git a/tns-core-modules/image-asset/image-asset.ios.ts b/tns-core-modules/image-asset/image-asset.ios.ts index 9e7c9f170..f7e7e0502 100644 --- a/tns-core-modules/image-asset/image-asset.ios.ts +++ b/tns-core-modules/image-asset/image-asset.ios.ts @@ -1,4 +1,4 @@ -import common = require("./image-asset-common"); +import * as common from "./image-asset-common"; global.moduleMerge(common, exports); diff --git a/tns-core-modules/image-source/image-source-common.ts b/tns-core-modules/image-source/image-source-common.ts index 0ba3d3eae..c754b1723 100644 --- a/tns-core-modules/image-source/image-source-common.ts +++ b/tns-core-modules/image-source/image-source-common.ts @@ -1,4 +1,4 @@ -import utils = require("utils/utils"); +import * as utils from "utils/utils"; import * as httpModule from "http"; import * as imageAssetModule from "image-asset"; @@ -10,7 +10,7 @@ function ensureHttp() { } // This is used for definition purposes only, it does not generate JavaScript for it. -import definition = require("image-source"); +import * as definition from "image-source"; export function fromAsset(asset: imageAssetModule.ImageAsset): Promise { let image = new definition.ImageSource(); diff --git a/tns-core-modules/image-source/image-source.android.ts b/tns-core-modules/image-source/image-source.android.ts index 1792de267..d8691016f 100644 --- a/tns-core-modules/image-source/image-source.android.ts +++ b/tns-core-modules/image-source/image-source.android.ts @@ -1,6 +1,6 @@ -import types = require("utils/types"); -import definition = require("image-source"); -import common = require("./image-source-common"); +import * as types from "utils/types"; +import * as definition from "image-source"; +import * as common from "./image-source-common"; import * as utilsModule from "utils/utils"; import * as fileSystemModule from "file-system"; import * as enumsModule from "ui/enums"; diff --git a/tns-core-modules/image-source/image-source.ios.ts b/tns-core-modules/image-source/image-source.ios.ts index abd7b12c7..3ddcf5258 100644 --- a/tns-core-modules/image-source/image-source.ios.ts +++ b/tns-core-modules/image-source/image-source.ios.ts @@ -1,8 +1,8 @@ -import definition = require("image-source"); -import types = require("utils/types"); -import fs = require("file-system"); -import common = require("./image-source-common"); -import enums = require("ui/enums"); +import * as definition from "image-source"; +import * as types from "utils/types"; +import * as fs from "file-system"; +import * as common from "./image-source-common"; +import * as enums from "ui/enums"; import * as imageAssetModule from "image-asset"; global.moduleMerge(common, exports); diff --git a/tns-core-modules/lib.core.d.ts b/tns-core-modules/lib.core.d.ts index 43918b42f..f3b1d662d 100644 --- a/tns-core-modules/lib.core.d.ts +++ b/tns-core-modules/lib.core.d.ts @@ -166,7 +166,7 @@ interface ObjectConstructor { * @param p The property name. * @param attributes Descriptor for the property. It can be for a data property or an accessor property. */ - defineProperty(o: any, p: string, attributes: PropertyDescriptor): any; + defineProperty(o: any, p: string | symbol, attributes: PropertyDescriptor): any; /** * Adds one or more properties to an object, and/or modifies attributes of existing properties. diff --git a/tns-core-modules/location/location-common.ts b/tns-core-modules/location/location-common.ts index d18d3f2b4..fda1d8363 100644 --- a/tns-core-modules/location/location-common.ts +++ b/tns-core-modules/location/location-common.ts @@ -1,5 +1,5 @@ -//import locationManagerModule = require("location/location-manager"); -import defModule = require("location"); +//import * as locationManagerModule from "location/location-manager"; +import * as defModule from "location"; import * as timerModule from "timer"; var defaultGetLocationTimeout = 20000; diff --git a/tns-core-modules/location/location.android.ts b/tns-core-modules/location/location.android.ts index 855217bbe..1a128215c 100644 --- a/tns-core-modules/location/location.android.ts +++ b/tns-core-modules/location/location.android.ts @@ -1,7 +1,7 @@ -import enums = require("ui/enums"); -import locationModule = require("location"); -import common = require("./location-common"); -import utils = require("utils/utils"); +import * as enums from "ui/enums"; +import * as locationModule from "location"; +import * as common from "./location-common"; +import * as utils from "utils/utils"; global.moduleMerge(common, exports); diff --git a/tns-core-modules/location/location.ios.ts b/tns-core-modules/location/location.ios.ts index 0f1ceba23..9529f5c03 100644 --- a/tns-core-modules/location/location.ios.ts +++ b/tns-core-modules/location/location.ios.ts @@ -1,5 +1,5 @@ -import locationModule = require("location"); -import common = require("./location-common"); +import * as locationModule from "location"; +import * as common from "./location-common"; global.moduleMerge(common, exports); diff --git a/tns-core-modules/platform/platform.android.ts b/tns-core-modules/platform/platform.android.ts index fa0e65f3d..cafad71c0 100644 --- a/tns-core-modules/platform/platform.android.ts +++ b/tns-core-modules/platform/platform.android.ts @@ -1,6 +1,6 @@ /* tslint:disable:class-name */ -import definition = require("platform"); -import utils = require("utils/utils"); +import * as definition from "platform"; +import * as utils from "utils/utils"; import * as enumsModule from "ui/enums"; const MIN_TABLET_PIXELS = 600; diff --git a/tns-core-modules/platform/platform.ios.ts b/tns-core-modules/platform/platform.ios.ts index 2deebcd9b..15896110b 100644 --- a/tns-core-modules/platform/platform.ios.ts +++ b/tns-core-modules/platform/platform.ios.ts @@ -1,5 +1,5 @@ /* tslint:disable:class-name */ -import definition = require("platform"); +import * as definition from "platform"; import * as utils from "utils/utils"; diff --git a/tns-core-modules/text/span-common.ts b/tns-core-modules/text/span-common.ts index 94a8d1c85..8b97bb248 100644 --- a/tns-core-modules/text/span-common.ts +++ b/tns-core-modules/text/span-common.ts @@ -1,10 +1,10 @@ -import colorModule = require("color"); -import definition = require("text/span"); -import bindable = require("ui/core/bindable"); -import types = require("utils/types"); -import view = require("ui/core/view"); -import enums = require("ui/enums"); -import formattedString = require("text/formatted-string"); +import * as colorModule from "color"; +import * as definition from "text/span"; +import * as bindable from "ui/core/bindable"; +import * as types from "utils/types"; +import * as view from "ui/core/view"; +import * as enums from "ui/enums"; +import * as formattedString from "text/formatted-string"; export class Span extends bindable.Bindable implements definition.Span, view.ApplyXmlAttributes { private _fontFamily: string; diff --git a/tns-core-modules/text/span.android.ts b/tns-core-modules/text/span.android.ts index ae6f43726..d8888795d 100644 --- a/tns-core-modules/text/span.android.ts +++ b/tns-core-modules/text/span.android.ts @@ -1,8 +1,8 @@ -import spanCommon = require("./span-common"); -import enums = require("ui/enums"); -import formattedString = require("text/formatted-string"); -import utils = require("utils/utils"); -import fontModule = require("ui/styling/font"); +import * as spanCommon from "./span-common"; +import * as enums from "ui/enums"; +import * as formattedString from "text/formatted-string"; +import * as utils from "utils/utils"; +import * as fontModule from "ui/styling/font"; global.moduleMerge(spanCommon, exports); diff --git a/tns-core-modules/text/span.d.ts b/tns-core-modules/text/span.d.ts index e09dd4900..d1ba45b48 100644 --- a/tns-core-modules/text/span.d.ts +++ b/tns-core-modules/text/span.d.ts @@ -1,7 +1,7 @@ declare module "text/span" { - import colorModule = require("color"); - import bindable = require("ui/core/bindable"); - import formattedString = require("text/formatted-string"); + import * as colorModule from "color"; + import * as bindable from "ui/core/bindable"; + import * as formattedString from "text/formatted-string"; /** * A class used to create a single part of formatted string with a common text properties. diff --git a/tns-core-modules/text/span.ios.ts b/tns-core-modules/text/span.ios.ts index 1f755ad62..6de56fff8 100644 --- a/tns-core-modules/text/span.ios.ts +++ b/tns-core-modules/text/span.ios.ts @@ -1,6 +1,6 @@ -import spanCommon = require("./span-common"); -import enums = require("ui/enums"); -import formattedString = require("text/formatted-string"); +import * as spanCommon from "./span-common"; +import * as enums from "ui/enums"; +import * as formattedString from "text/formatted-string"; import * as utils from "utils/utils"; diff --git a/tns-core-modules/trace/Readme.md b/tns-core-modules/trace/Readme.md index c71aa4ad1..f9c9ad625 100644 --- a/tns-core-modules/trace/Readme.md +++ b/tns-core-modules/trace/Readme.md @@ -2,7 +2,7 @@ The trace module is used to track code execution and to receive notifications fo It is disabled by default and to enable it you will need to call its enable() method. ```js -import trace = require("trace"); +import * as trace from "trace"; trace.enable(); ``` @@ -11,19 +11,19 @@ The module writes its output through a collection of TraceWriter objects. By def How to specify category(s): ```js -import trace = require("trace"); +import * as trace from "trace"; // only the Layout messages are traced trace.setCategories(traceCategories.Layout); ``` ```js -import trace = require("trace"); +import * as trace from "trace"; // set Layout + VisualTreeEvents categories trace.setCategories(traceCategories.concat(traceCategories.Layout, traceCategories.VisualTreeEvents)); ``` ```js -import trace = require("trace"); +import * as trace from "trace"; // trace everything trace.setCategories(traceCategories.All); ``` @@ -31,7 +31,7 @@ trace.setCategories(traceCategories.All); How to trace: ```js -import trace = require("trace"); +import * as trace from "trace"; traceWrite("tracing message", traceCategories.Layout); ``` @@ -40,7 +40,7 @@ The module also supports events notifications through the EventListener interfac How to create and register a listener: ```js -import trace = require("trace"); +import * as trace from "trace"; class Listener implements trace.EventListener { public filter: string; @@ -69,8 +69,8 @@ trace.addEventListener(listener); How to raise events: ```js -import trace = require("trace"); -import view = require("ui/core/view"); +import * as trace from "trace"; +import * as view from "ui/core/view"; var newView = new view.View(); trace.notifyEvent(newView, "_viewCreated"); diff --git a/tns-core-modules/trace/trace.ts b/tns-core-modules/trace/trace.ts index 3a2e21875..9b633f767 100644 --- a/tns-core-modules/trace/trace.ts +++ b/tns-core-modules/trace/trace.ts @@ -1,4 +1,4 @@ -import definition = require("trace"); +import * as definition from "trace"; import * as types from "utils/types"; export var enabled = false; diff --git a/tns-core-modules/ui/core/bindable.ts b/tns-core-modules/ui/core/bindable.ts index 3a3a128d7..e5f31b65d 100644 --- a/tns-core-modules/ui/core/bindable.ts +++ b/tns-core-modules/ui/core/bindable.ts @@ -1,4 +1,4 @@ -import definition = require("ui/core/bindable"); +import * as definition from "ui/core/bindable"; import { Observable, PropertyChangeData } from "data/observable"; import { unsetValue, DependencyObservable, Property, PropertyMetadata, PropertyMetadataSettings, PropertyChangeData as DependencyPropertyChangeData } from "ui/core/dependency-observable"; import { addWeakEventListener, removeWeakEventListener } from "ui/core/weak-event-listener"; diff --git a/tns-core-modules/ui/core/dependency-observable.d.ts b/tns-core-modules/ui/core/dependency-observable.d.ts index 663d5d1d7..8fb623001 100644 --- a/tns-core-modules/ui/core/dependency-observable.d.ts +++ b/tns-core-modules/ui/core/dependency-observable.d.ts @@ -7,7 +7,8 @@ declare module "ui/core/dependency-observable" { /** * Value specifing that Property value should be reset. Used when bindingContext on bound property is creared/null. */ - export const unsetValue: Object; + export const unsetValue: any; + /** * Interface used by Propery 'defaultValueGetter' function to specify if the default value returned by the native instance can be cached or not. * One example is - android.widget.Button background. It is state drawable so it cannot be reused/cached. diff --git a/tns-core-modules/ui/core/proxy.ts b/tns-core-modules/ui/core/proxy.ts index ceeae7985..36b6389aa 100644 --- a/tns-core-modules/ui/core/proxy.ts +++ b/tns-core-modules/ui/core/proxy.ts @@ -1,6 +1,6 @@ -import bindable = require("ui/core/bindable"); -import dependencyObservable = require("ui/core/dependency-observable"); -import definition = require("ui/core/proxy"); +import * as bindable from "ui/core/bindable"; +import * as dependencyObservable from "ui/core/dependency-observable"; +import * as definition from "ui/core/proxy"; import * as types from "utils/types"; import * as observable from "data/observable"; diff --git a/tns-core-modules/ui/core/view-common.ts b/tns-core-modules/ui/core/view-common.ts index 7133ef20e..ce754cc88 100644 --- a/tns-core-modules/ui/core/view-common.ts +++ b/tns-core-modules/ui/core/view-common.ts @@ -948,30 +948,13 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition { // // Check for a valid _nativeView instance // return !!this._nativeView; // } -} -export function getLengthEffectiveValue(param: Length): number { - switch (param.unit) { - case "px": - return Math.round(param.value); - - default: - case "dip": - return Math.round(layout.getDisplayDensity() * param.value); + public _getValue(): never { + throw new Error("The View._setValue is obsolete. There is a new property system.") } -} -function getPercentLengthEffectiveValue(prentAvailableLength: number, param: PercentLength): number { - switch (param.unit) { - case "%": - return Math.round(prentAvailableLength * param.value); - - case "px": - return Math.round(param.value); - - default: - case "dip": - return Math.round(layout.getDisplayDensity() * param.value); + public _setValue(): never { + throw new Error("The View._setValue is obsolete. There is a new property system.") } } @@ -982,25 +965,64 @@ function updateChildLayoutParams(child: ViewCommon, parent: ViewCommon, density: let parentWidthMeasureSize = layout.getMeasureSpecSize(parentWidthMeasureSpec); let parentWidthMeasureMode = layout.getMeasureSpecMode(parentWidthMeasureSpec); let parentAvailableWidth = parentWidthMeasureMode === layout.UNSPECIFIED ? -1 : parentWidthMeasureSize; - style.effectiveWidth = getPercentLengthEffectiveValue(parentAvailableWidth, style.width); - style.effectiveMarginLeft = getPercentLengthEffectiveValue(parentAvailableWidth, style.marginLeft); - style.effectiveMarginRight = getPercentLengthEffectiveValue(parentAvailableWidth, style.marginRight); + style.effectiveWidth = PercentLength.toDevicePixels(style.width, parentAvailableWidth) + style.effectiveMarginLeft = PercentLength.toDevicePixels(style.marginLeft, parentAvailableWidth); + style.effectiveMarginRight = PercentLength.toDevicePixels(style.marginRight, parentAvailableWidth); let parentHeightMeasureSpec = parent._currentHeightMeasureSpec; let parentHeightMeasureSize = layout.getMeasureSpecSize(parentHeightMeasureSpec); let parentHeightMeasureMode = layout.getMeasureSpecMode(parentHeightMeasureSpec); let parentAvailableHeight = parentHeightMeasureMode === layout.UNSPECIFIED ? -1 : parentHeightMeasureSize; - style.effectiveHeight = getPercentLengthEffectiveValue(parentAvailableHeight, style.height); - style.effectiveMarginTop = getPercentLengthEffectiveValue(parentAvailableHeight, style.marginTop); - style.effectiveMarginBottom = getPercentLengthEffectiveValue(parentAvailableHeight, style.marginBottom); + style.effectiveHeight = PercentLength.toDevicePixels(style.height, parentAvailableHeight); + style.effectiveMarginTop = PercentLength.toDevicePixels(style.marginTop, parentAvailableHeight); + style.effectiveMarginBottom = PercentLength.toDevicePixels(style.marginBottom, parentAvailableHeight); } -interface Length { - readonly unit: "dip" | "px"; - readonly value: number; +function equalsCommon(a: Length, b: Length): boolean; +function equalsCommon(a: PercentLength, b: PercentLength): boolean; +function equalsCommon(a: PercentLength, b: PercentLength): boolean { + if (a == "auto") { + return b == "auto"; + } + if (typeof a === "number") { + if (b == "auto") { + return false; + } + if (typeof b === "number") { + return a == b; + } + return b.unit == "dip" && a == b.value; + } + if (b == "auto") { + return false; + } + if (typeof b === "number") { + return a.unit == "dip" && a.value == b; + } + return a.value == b.value && a.unit == b.unit; } -interface PercentLength { +function toDevicePixelsCommon(length: Length, auto: number): number; +function toDevicePixelsCommon(length: PercentLength, auto: number, parentSize: number): number; +function toDevicePixelsCommon(length: PercentLength, auto: number, parentAvailableWidth?: number): number { + if (length == "auto") { + return auto; + } + if (typeof length === "number") { + return Math.round(layout.getDisplayDensity() * length); + } + switch (length.unit) { + case "px": + return Math.round(length.value); + default: + case "dip": + return Math.round(layout.getDisplayDensity() * length.value); + case "%": + return Math.round(parentAvailableWidth * length.value); + } +} + +export type PercentLength = "auto" | number | { readonly unit: "%" | "dip" | "px"; readonly value: number; } @@ -1043,11 +1065,20 @@ export namespace PercentLength { return value; } } + export const equals: { (a: PercentLength, b: PercentLength): boolean } = equalsCommon; + export const toDevicePixels: { (length: PercentLength, parentAvailableWidth: number): number } = toDevicePixelsCommon; } +export type Length = "auto" | number | { + readonly unit: "dip" | "px"; + readonly value: number; +}; + export namespace Length { export function parse(value: string | Length): Length { - if (typeof value === "string") { + if (value == "auto") { + return "auto"; + } else if (typeof value === "string") { let type: "dip" | "px"; let numberValue = 0; let stringValue = value.trim(); @@ -1072,6 +1103,18 @@ export namespace Length { return value; } } + export const equals: { (a: Length, b: Length): boolean } = equalsCommon; + export const toDevicePixels: { (length: Length, auto: number): number } = toDevicePixelsCommon; +} + +declare module "ui/core/view" { + export namespace Length { + export function toDevicePixels(length: Length, auto: number): number; + } + + export namespace PercentLength { + export function toDevicePixels(length: PercentLength, auto: number, availableParentSize: number): number; + } } export function booleanConverter(v: string): boolean { @@ -1102,32 +1145,28 @@ isUserInteractionEnabledProperty.register(ViewCommon); export const zeroLength: Length = { value: 0, unit: "px" }; -export function lengthComparer(x: Length, y: Length): boolean { - return x.unit === y.unit && x.value === y.value; -} - export const minWidthProperty = new CssProperty({ - name: "minWidth", cssName: "min-width", defaultValue: zeroLength, affectsLayout: isIOS, equalityComparer: lengthComparer, + name: "minWidth", cssName: "min-width", defaultValue: zeroLength, affectsLayout: isIOS, equalityComparer: Length.equals, valueChanged: (target, newValue) => { - target.effectiveMinWidth = getLengthEffectiveValue(newValue); + target.effectiveMinWidth = Length.toDevicePixels(newValue, 0); }, valueConverter: Length.parse }); minWidthProperty.register(Style); export const minHeightProperty = new CssProperty({ - name: "minHeight", cssName: "min-height", defaultValue: zeroLength, affectsLayout: isIOS, equalityComparer: lengthComparer, + name: "minHeight", cssName: "min-height", defaultValue: zeroLength, affectsLayout: isIOS, equalityComparer: Length.equals, valueChanged: (target, newValue) => { - target.effectiveMinHeight = getLengthEffectiveValue(newValue); + target.effectiveMinHeight = Length.toDevicePixels(newValue, 0); }, valueConverter: Length.parse }); minHeightProperty.register(Style); const matchParent: Length = { value: -1, unit: "px" }; -export const widthProperty = new CssProperty({ name: "width", cssName: "width", defaultValue: matchParent, affectsLayout: isIOS, equalityComparer: lengthComparer, valueConverter: PercentLength.parse }); +export const widthProperty = new CssProperty({ name: "width", cssName: "width", defaultValue: matchParent, affectsLayout: isIOS, equalityComparer: Length.equals, valueConverter: PercentLength.parse }); widthProperty.register(Style); -export const heightProperty = new CssProperty({ name: "height", cssName: "height", defaultValue: matchParent, affectsLayout: isIOS, equalityComparer: lengthComparer, valueConverter: PercentLength.parse }); +export const heightProperty = new CssProperty({ name: "height", cssName: "height", defaultValue: matchParent, affectsLayout: isIOS, equalityComparer: Length.equals, valueConverter: PercentLength.parse }); heightProperty.register(Style); const marginProperty = new ShorthandProperty