From 8623f4e6d572a8bcf5d27a7e964951ccaa60a64b Mon Sep 17 00:00:00 2001
From: Rossen Hristov <rossen.hristov@telerik.com>
Date: Fri, 22 Apr 2016 11:08:36 +0300
Subject: [PATCH] Fixed: Unable to show dialog from a modal page

Resolves #1809
---
 apps/modal-views-demo/login-page.ts  | 10 ++++++++++
 apps/modal-views-demo/login-page.xml |  1 +
 ui/dialogs/dialogs.ios.ts            |  2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/apps/modal-views-demo/login-page.ts b/apps/modal-views-demo/login-page.ts
index 357c91e5a..08cccff96 100644
--- a/apps/modal-views-demo/login-page.ts
+++ b/apps/modal-views-demo/login-page.ts
@@ -2,6 +2,7 @@
 import pages = require("ui/page");
 import textField = require("ui/text-field");
 import frame = require("ui/frame");
+import dialogs = require("ui/dialogs");
 
 var closeCallback: Function;
 
@@ -65,4 +66,13 @@ export function onLoginButtonTap() {
     else {
         frame.topmost().goBack();
     }
+}
+
+export function onShowDialogButtonTap() {
+    console.log(">>> login-page.onShowDialogButtonTap");
+
+    dialogs.alert({ title: "test", message: "Anything", okButtonText: "ok" })
+        .then(function () {
+            console.log("Dialog closed!");
+        });
 }
\ No newline at end of file
diff --git a/apps/modal-views-demo/login-page.xml b/apps/modal-views-demo/login-page.xml
index 4d5a182e8..e5640403d 100644
--- a/apps/modal-views-demo/login-page.xml
+++ b/apps/modal-views-demo/login-page.xml
@@ -12,5 +12,6 @@
     <TextField hint="username" id="username" text="username"/>
     <TextField hint="password" id="password" text="password" secure="true"/>
     <Button text="Login" tap="onLoginButtonTap"/>
+    <Button text="Show Dialog" tap="onShowDialogButtonTap"/>
   </StackLayout>
 </Page>
\ No newline at end of file
diff --git a/ui/dialogs/dialogs.ios.ts b/ui/dialogs/dialogs.ios.ts
index 7e200cb79..309f650bb 100644
--- a/ui/dialogs/dialogs.ios.ts
+++ b/ui/dialogs/dialogs.ios.ts
@@ -388,7 +388,7 @@ export function login(arg: any): Promise<dialogs.LoginResult> {
 function showUIAlertController(alertController: UIAlertController) {
     var currentPage = dialogsCommon.getCurrentPage();
     if (currentPage) {
-        var viewController: UIViewController = currentPage.ios;
+        var viewController: UIViewController = currentPage.modal ? currentPage.modal.ios : currentPage.ios;
         if (viewController) {
             if (alertController.popoverPresentationController) {
                 alertController.popoverPresentationController.sourceView = viewController.view;