Fixed #779: frame.topmost().currentPage is not the same instance as the page being loaded in page.loaded event handler.

apps/modal-views-demo/main-page.ts

@@ -1,13 +1,25 @@
 import observable = require("data/observable");
 import pages = require("ui/page");
 import labelModule = require("ui/label");
+import frame = require("ui/frame");
 
 var page: pages.Page;
 var label: labelModule.Label;
 
-export function pageLoaded(args: observable.EventData) {
+export function onLoaded(args: observable.EventData) {
+    console.log("main-page.onLoaded");
+    if (args.object !== frame.topmost().currentPage) {
+        throw new Error("args.object must equal frame.topmost().currentPage on page.loaded");
+    }
     page = <pages.Page>args.object;
-    label = page.getViewById<labelModule.Label>("label");
+    label = frame.topmost().getViewById<labelModule.Label>("label");
+    if (!label) {
+        throw new Error("Could not find `label`");
+    }
+}
+
+export function onNavigatedTo(args: observable.EventData) {
+    console.log("main-page.onNavigatedTo");
 }
 
 export function onTap(args: observable.EventData) {

apps/modal-views-demo/main-page.xml

@@ -1,4 +1,4 @@
-<Page xmlns="http://www.nativescript.org/tns.xsd" loaded="pageLoaded" id="_mainPage" backgroundColor="Red">
+<Page xmlns="http://www.nativescript.org/tns.xsd" loaded="onLoaded" navigatedTo="onNavigatedTo" id="_mainPage" backgroundColor="Red">
   <StackLayout backgroundColor="PaleGreen">
     <Button text="Login (small)" tap="onTap" />
     <Button text="Login (full-screen)" tap="onTap" />

apps/tests/ui/page/modal-page.ts

@@ -0,0 +1,6 @@
+import {ShownModallyData} from "ui/page";
+
+export function onShownModally(args: ShownModallyData) {
+    args.context.shownModally = true;
+    args.closeCallback("return value");
+}

apps/tests/ui/page/modal-page.xml

@@ -0,0 +1,5 @@
+<Page shownModally="onShownModally">
+  <StackLayout>
+    <Label text="Modal Page" />
+  </StackLayout>
+</Page>

apps/tests/ui/page/page-tests-common.ts

@@ -27,6 +27,7 @@ import LabelModule = require("ui/label");
 import stackLayoutModule = require("ui/layouts/stack-layout");
 import helper = require("../helper");
 import view = require("ui/core/view");
+import platform = require("platform");
 
 export function addLabelToPage(page: PageModule.Page, text?: string) {
     var label = new LabelModule.Label();
@@ -368,6 +369,75 @@ export function test_page_backgroundColor_is_white() {
     });
 }
 
+export function test_WhenPageIsLoadedFrameCurrentPageIsTheSameInstance() {
+    var page;
+    var loadedEventHandler = function (args) {
+        console.log("loadedEventHandler");
+        TKUnit.assert(FrameModule.topmost().currentPage === args.object, `frame.topmost().currentPage should be equal to args.object page instance in the page.loaded event handler. Expected: ${args.object.id}; Actual: ${FrameModule.topmost().currentPage.id};`);
+    }
+
+    var pageFactory = function (): PageModule.Page {
+        page = new PageModule.Page();
+        page.id = "newPage";
+        page.on(view.View.loadedEvent, loadedEventHandler);
+        var label = new LabelModule.Label();
+        label.text = "Text";
+        page.content = label;
+        return page;
+    };
+
+    try {
+        helper.navigate(pageFactory);
+        page.off(view.View.loadedEvent, loadedEventHandler);
+    }
+    finally {
+        helper.goBack();
+    }
+}
+
+export function test_WhenPageIsLoadedItCanShowAnotherPageAsModal_iOS() {
+    if (platform.device.os === platform.platformNames.android) {
+        // We can't show a modal from another modal on Android.
+        return;
+    }
+
+    var masterPage;
+    var ctx = {
+        shownModally: false
+    };
+
+    var modalClosed = false;
+    var modalCloseCallback = function (returnValue: any) {
+        TKUnit.assert(ctx.shownModally, "Modal-page must be shown!");
+        TKUnit.assert(returnValue === "return value", "Modal-page must return value!");
+        modalClosed = true;
+    }
+
+    var loadedEventHandler = function (args) {
+        var basePath = "ui/page/";
+        args.object.showModal(basePath + "modal-page", ctx, modalCloseCallback, false);
+    };
+
+    var masterPageFactory = function(): PageModule.Page {
+        masterPage = new PageModule.Page();
+        masterPage.id = "newPage";
+        masterPage.on(view.View.loadedEvent, loadedEventHandler);
+        var label = new LabelModule.Label();
+        label.text = "Text";
+        masterPage.content = label;
+        return masterPage;
+    };
+
+    try {
+        helper.navigate(masterPageFactory);
+        TKUnit.waitUntilReady(() => { return modalClosed; });
+        masterPage.off(view.View.loadedEvent, loadedEventHandler);
+    }
+    finally {
+        helper.goBack();
+    }
+}
+
 //export function test_ModalPage_Layout_is_Correct() {
 //    var testPage: PageModule.Page;
 //    var label: LabelModule.Label;