diff --git a/apps/modal-views-demo/main-page.ts b/apps/modal-views-demo/main-page.ts index a3e1f46c6..cf185e5d2 100644 --- a/apps/modal-views-demo/main-page.ts +++ b/apps/modal-views-demo/main-page.ts @@ -1,67 +1,62 @@ -import observable = require("data/observable"); -import pages = require("ui/page"); -import labelModule = require("ui/label"); +import {EventData} from "data/observable"; +import {Page} from "ui/page"; +import {Label} from "ui/label"; import frame = require("ui/frame"); -var page: pages.Page; -var label: labelModule.Label; - -export function onNavigatingTo(args: observable.EventData) { +export function onNavigatingTo(args: EventData) { console.log(">>> main-page.onNavigatingTo"); //console.trace(); } -export function onLoaded(args: observable.EventData) { +export function onLoaded(args: EventData) { console.log(">>> main-page.onLoaded"); //console.trace(); - if (args.object !== frame.topmost().currentPage) { - throw new Error("args.object must equal frame.topmost().currentPage on page.loaded"); - } - page = args.object; - label = frame.topmost().getViewById("label"); - if (!label) { - throw new Error("Could not find `label`"); - } } -export function onNavigatedTo(args: observable.EventData) { +export function onNavigatedTo(args: EventData) { console.log(">>> main-page.onNavigatedTo"); //console.trace(); } -export function onNavigatingFrom(args: observable.EventData) { +export function onNavigatingFrom(args: EventData) { console.log(">>> main-page.onNavigatingFrom"); } -export function onNavigatedFrom(args: observable.EventData) { +export function onNavigatedFrom(args: EventData) { console.log(">>> main-page.onNavigatedFrom"); } -export function onUnloaded(args: observable.EventData) { +export function onUnloaded(args: EventData) { console.log(">>> main-page.onUnloaded"); } -export function onTap(args: observable.EventData) { +export function onTap(args: EventData) { + let page = (args.object).page; if ((args.object).text.indexOf("(navigate)") !== -1) { var entry: frame.NavigationEntry = { moduleName: "./login-page", context: "Context from navigate" }; - frame.topmost().navigate(entry); + + page.frame.navigate(entry); } else { var fullscreen = (args.object).text.indexOf("(full-screen)") !== -1; - showModal(fullscreen); + showModal(page, fullscreen); } } -function showModal(fullscreen?: boolean) { +function showModal(page: Page, fullscreen?: boolean) { page.showModal("./modal-views-demo/login-page", "Context from showModal", function (username: string, password: string) { console.log(username + "/" + password); - label.text = username + "/" + password; + let label = page.getViewById