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/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/xml-declaration/inherited-base-page.ts b/apps/tests/xml-declaration/inherited-base-page.ts new file mode 100644 index 000000000..20c3dc029 --- /dev/null +++ b/apps/tests/xml-declaration/inherited-base-page.ts @@ -0,0 +1,4 @@ +import {Page} from "ui/page"; + +export class InheritedPage extends Page { +} diff --git a/apps/tests/xml-declaration/inherited-page.ts b/apps/tests/xml-declaration/inherited-page.ts new file mode 100644 index 000000000..48e494f9d --- /dev/null +++ b/apps/tests/xml-declaration/inherited-page.ts @@ -0,0 +1,7 @@ +import {Page} from "ui/page"; +import {Label} from "ui/label"; + +export function pageLoaded(args) { + var page = args.object; + (