diff --git a/apps/action-bar-demo/pages/action-bar-hidden.ts b/apps/action-bar-demo/pages/action-bar-hidden.ts index 95b686e5c..c7c9604d3 100644 --- a/apps/action-bar-demo/pages/action-bar-hidden.ts +++ b/apps/action-bar-demo/pages/action-bar-hidden.ts @@ -3,7 +3,7 @@ import view = require("ui/core/view"); var toggle = false; export function toggleTap(args) { - var page = view.getAncestor(args.object, "Page") + var page = (args.object).page; page.actionBarHidden = toggle; toggle = !toggle; -} \ No newline at end of file +} diff --git a/apps/action-bar-demo/pages/data-binding.ts b/apps/action-bar-demo/pages/data-binding.ts index 2832b7fb5..b6bf5680e 100644 --- a/apps/action-bar-demo/pages/data-binding.ts +++ b/apps/action-bar-demo/pages/data-binding.ts @@ -24,7 +24,7 @@ export function pageLoaded(args) { } var i = 0; export function buttonTap(args) { - var page = view.getAncestor(args.object, "Page") + var page = (args.object).page; var vm = page.bindingContext; var icon; if (i % 3 === 0) { diff --git a/apps/action-bar-demo/pages/navigation-button.ts b/apps/action-bar-demo/pages/navigation-button.ts index b0a0fadf8..37a544a68 100644 --- a/apps/action-bar-demo/pages/navigation-button.ts +++ b/apps/action-bar-demo/pages/navigation-button.ts @@ -5,7 +5,7 @@ import view = require("ui/core/view"); var i = 0; export function buttonTap(args: observable.EventData) { - var page = view.getAncestor(args.object, "Page") + var page = (args.object).page; var navBtn = new action.NavigationButton(); navBtn.text = "nav " + i++; @@ -26,7 +26,7 @@ export function buttonTap(args: observable.EventData) { var j = 0; export function visibilityTap(args: observable.EventData) { - var page = view.getAncestor(args.object, "Page") + var page = (args.object).page; if (page.actionBar.android) { if (j % 3 === 0) { diff --git a/apps/action-bar-demo/pages/page-title-icon.ts b/apps/action-bar-demo/pages/page-title-icon.ts index df808c206..7baa72878 100644 --- a/apps/action-bar-demo/pages/page-title-icon.ts +++ b/apps/action-bar-demo/pages/page-title-icon.ts @@ -4,7 +4,7 @@ import view = require("ui/core/view"); var i = 0; export function buttonTap(args: observable.EventData) { - var page = view.getAncestor(args.object, "Page") + var page = (args.object).page; page.actionBar.title = "Title changed " + i++; if (page.actionBar.android) { @@ -22,7 +22,7 @@ export function buttonTap(args: observable.EventData) { var j = 0; export function visibilityTap(args: observable.EventData) { - var page = view.getAncestor(args.object, "Page") + var page = (args.object).page; if (page.actionBar.android) { if (j % 3 === 0) { diff --git a/apps/tests/TKUnit.ts b/apps/tests/TKUnit.ts index 3c607b265..2e11ce19f 100644 --- a/apps/tests/TKUnit.ts +++ b/apps/tests/TKUnit.ts @@ -188,11 +188,11 @@ export function assertEqual(actual: any, expected: any, message?: string) { // Use the equals method if (!actual.equals(expected)) { - throw new Error(message + " Actual: " + actual + " Expected: " + expected); + throw new Error(`${message} Actual: <${actual}>(${typeof(actual)}). Expected: <${expected}>(${typeof(expected)})`); } } else if (actual !== expected) { - throw new Error(message + " Actual: " + actual + " Expected: " + expected); + throw new Error(`${message} Actual: <${actual}>(${typeof(actual)}). Expected: <${expected}>(${typeof(expected)})`); } }; diff --git a/apps/tests/pages/background-test.ts b/apps/tests/pages/background-test.ts index 17f9c2096..daa8289fc 100644 --- a/apps/tests/pages/background-test.ts +++ b/apps/tests/pages/background-test.ts @@ -2,12 +2,12 @@ import view = require("ui/core/view"); import pages = require("ui/page"); export function applyTap(args) { - var page = view.getAncestor(args.object, "Page"); + var page = (args.object).page; var css = "#test-element { " + args.object.tag + " }"; page.css = css; } export function resetTap(args) { - var page = view.getAncestor(args.object, "Page"); + var page = (args.object).page; page.css = ""; -} \ No newline at end of file +} diff --git a/apps/tests/ui/list-view/list-view-tests.ts b/apps/tests/ui/list-view/list-view-tests.ts index 7086e824a..c256f74dd 100644 --- a/apps/tests/ui/list-view/list-view-tests.ts +++ b/apps/tests/ui/list-view/list-view-tests.ts @@ -465,7 +465,7 @@ export function test_usingAppLevelConvertersInListViewItems() { var dateConverter = function (value, format) { var result = format; var day = value.getDate(); - result = result.replace("DD", month < 10 ? "0" + day : day); + result = result.replace("DD", day < 10 ? "0" + day : day); var month = value.getMonth() + 1; result = result.replace("MM", month < 10 ? "0" + month : month); result = result.replace("YYYY", value.getFullYear()); @@ -475,8 +475,7 @@ export function test_usingAppLevelConvertersInListViewItems() { app.resources["dateConverter"] = dateConverter; var data = new observableArray.ObservableArray(); - - data.push({ date: new Date() }); + data.push({ date: new Date(2020, 2, 7) }); function testAction(views: Array) { listView.itemTemplate = "