From 25e53369eeb3750fc83210e225386464be00412e Mon Sep 17 00:00:00 2001
From: Vladimir Enchev <vladimir.enchev@telerik.com>
Date: Fri, 24 Apr 2015 17:14:55 +0300
Subject: [PATCH] OK button moved from first to last

---
 ui/dialogs/dialogs.ios.ts | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/ui/dialogs/dialogs.ios.ts b/ui/dialogs/dialogs.ios.ts
index 853dc2874..1c5bbc4b9 100644
--- a/ui/dialogs/dialogs.ios.ts
+++ b/ui/dialogs/dialogs.ios.ts
@@ -62,10 +62,6 @@ function addButtonsToAlertDialog(alert: UIAlertView, options: dialogs.ConfirmOpt
         return;
     }
 
-    if (options.okButtonText) {
-        alert.addButtonWithTitle(options.okButtonText);
-    }
-
     if (options.cancelButtonText) {
         alert.addButtonWithTitle(options.cancelButtonText);
     }
@@ -73,6 +69,10 @@ function addButtonsToAlertDialog(alert: UIAlertView, options: dialogs.ConfirmOpt
     if (options.neutralButtonText) {
         alert.addButtonWithTitle(options.neutralButtonText);
     }
+
+    if (options.okButtonText) {
+        alert.addButtonWithTitle(options.okButtonText);
+    }
 }
 
 function addButtonsToAlertController(alertController: UIAlertController, options: dialogs.ConfirmOptions,
@@ -81,14 +81,6 @@ function addButtonsToAlertController(alertController: UIAlertController, options
         return;
     }
 
-    if (types.isString(options.okButtonText)) {
-        alertController.addAction(UIAlertAction.actionWithTitleStyleHandler(options.okButtonText, UIAlertActionStyle.UIAlertActionStyleDefault, (arg: UIAlertAction) => {
-            if (types.isFunction(okCallback)) {
-                okCallback();
-            }
-        }));
-    }
-
     if (types.isString(options.cancelButtonText)) {
         alertController.addAction(UIAlertAction.actionWithTitleStyleHandler(options.cancelButtonText, UIAlertActionStyle.UIAlertActionStyleDefault, (arg: UIAlertAction) => {
             if (types.isFunction(cancelCallback)) {
@@ -104,6 +96,14 @@ function addButtonsToAlertController(alertController: UIAlertController, options
             }
         }));
     }
+
+    if (types.isString(options.okButtonText)) {
+        alertController.addAction(UIAlertAction.actionWithTitleStyleHandler(options.okButtonText, UIAlertActionStyle.UIAlertActionStyleDefault, (arg: UIAlertAction) => {
+            if (types.isFunction(okCallback)) {
+                okCallback();
+            }
+        }));
+    }
 }
 
 export function alert(arg: any): Promise<void> {