Merge pull request NativeScript#1174 from NativeScript/alert-fixes

Vladimir Enchev · Vladimir Enchev · commit 82c86ad86579 · 2015-11-27T16:39:30.000+02:00
alert fixed
diff --git a/apps/gallery-app/views/dialogs.ts b/apps/gallery-app/views/dialogs.ts
@@ -12,6 +12,32 @@ export function alertWithOptionsTapped(args) {
     });
 }
 
+export function alertWithNullTapped(args) {
+    dialogs.alert(null);
+}
+
+export function alertWithUndefinedTapped(args) {
+    dialogs.alert(undefined);
+}
+
+export function alertWithNumberTapped(args) {
+    dialogs.alert(1);
+}
+
+export function alertWithBooleanTapped(args) {
+    dialogs.alert(false);
+}
+
+export function alertWithFunctionTapped(args) {
+    dialogs.alert(function () {
+        //
+    });
+}
+
+export function alertWithObjectTapped(args) {
+    dialogs.alert({});
+}
+
 export function confirmTapped(args) {
     dialogs.confirm("Are you sure?").then(r=> console.log(`Confirm result: ${r}`));
 }
diff --git a/apps/gallery-app/views/dialogs.xml b/apps/gallery-app/views/dialogs.xml
@@ -4,6 +4,12 @@
     <StackLayout>
       <Button text="alert" tap="alertTapped"/>
       <Button text="alert with options" tap="alertWithOptionsTapped"/>
+      <Button text="alert with null" tap="alertWithNullTapped"/>
+      <Button text="alert with undefined" tap="alertWithUndefinedTapped"/>
+      <Button text="alert with number" tap="alertWithNumberTapped"/>
+      <Button text="alert with boolean" tap="alertWithBooleanTapped"/>
+      <Button text="alert with function" tap="alertWithFunctionTapped"/>
+      <Button text="alert with object" tap="alertWithObjectTapped"/>
       <Button text="confirm" tap="confirmTapped"/>
       <Button text="confirm with options" tap="confirmWithOptionsTapped"/>
       <Button text="prompt" tap="promptTapped"/>
diff --git a/ui/dialogs/dialogs-common.ts b/ui/dialogs/dialogs-common.ts
@@ -4,6 +4,7 @@ import page = require("ui/page");
 import button = require("ui/button");
 import textField = require("ui/text-field");
 import label = require("ui/label");
+import types = require("utils/types");
 
 export var STRING = "string",
     PROMPT = "Prompt",
@@ -78,4 +79,8 @@ export function getLabelColor(): color.Color {
     }
 
     return labelColor;
+}
+
+export function isDialogOptions(arg): boolean {
+    return !types.isNullOrUndefined(arg) && (arg.message || arg.title);
 }
diff --git a/ui/dialogs/dialogs.android.ts b/ui/dialogs/dialogs.android.ts
@@ -84,7 +84,7 @@ function addButtonsToAlertDialog(alert: android.app.AlertDialog.Builder, options
 export function alert(arg: any): Promise<void> {
     return new Promise<void>((resolve, reject) => {
         try {
-            var options = types.isString(arg) ? { title: dialogsCommon.ALERT, okButtonText: dialogsCommon.OK, message: arg } : arg;
+            var options = !dialogsCommon.isDialogOptions(arg) ? { title: dialogsCommon.ALERT, okButtonText: dialogsCommon.OK, message: arg + "" } : arg;
 
             var alert = createAlertDialog(options);
 
@@ -111,7 +111,7 @@ export function alert(arg: any): Promise<void> {
 export function confirm(arg: any): Promise<boolean> {
     return new Promise<boolean>((resolve, reject) => {
         try {
-            var options = types.isString(arg) ? { title: dialogsCommon.CONFIRM, okButtonText: dialogsCommon.OK, cancelButtonText: dialogsCommon.CANCEL, message: arg } : arg;
+            var options = !dialogsCommon.isDialogOptions(arg) ? { title: dialogsCommon.CONFIRM, okButtonText: dialogsCommon.OK, cancelButtonText: dialogsCommon.CANCEL, message: arg + "" } : arg;
             var alert = createAlertDialog(options);
 
             addButtonsToAlertDialog(alert, options, function (result) { resolve(result); });
diff --git a/ui/dialogs/dialogs.ios.ts b/ui/dialogs/dialogs.ios.ts
@@ -135,7 +135,7 @@ function raiseCallback(callback, result) {
 export function alert(arg: any): Promise<void> {
     return new Promise<void>((resolve, reject) => {
         try {
-            var options = types.isString(arg) ? { title: dialogsCommon.ALERT, okButtonText: dialogsCommon.OK, message: arg } : arg;
+            var options = !dialogsCommon.isDialogOptions(arg) ? { title: dialogsCommon.ALERT, okButtonText: dialogsCommon.OK, message: arg + "" } : arg;
 
             if (utils.ios.MajorVersion < 8) {
                 var alert = createUIAlertView(options);
@@ -170,7 +170,7 @@ export function alert(arg: any): Promise<void> {
 export function confirm(arg: any): Promise<boolean> {
     return new Promise<boolean>((resolve, reject) => {
         try {
-            var options = types.isString(arg) ? { title: dialogsCommon.CONFIRM, okButtonText: dialogsCommon.OK, cancelButtonText: dialogsCommon.CANCEL, message: arg } : arg;
+            var options = !dialogsCommon.isDialogOptions(arg) ? { title: dialogsCommon.CONFIRM, okButtonText: dialogsCommon.OK, cancelButtonText: dialogsCommon.CANCEL, message: arg + "" } : arg;
 
             if (utils.ios.MajorVersion < 8) {
                 var alert = createUIAlertView(options);

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import page = require("ui/page");`
`4`	`4`	`import button = require("ui/button");`
`5`	`5`	`import textField = require("ui/text-field");`
`6`	`6`	`import label = require("ui/label");`
	`7`	`+import types = require("utils/types");`
`7`	`8`
`8`	`9`	`export var STRING = "string",`
`9`	`10`	`PROMPT = "Prompt",`
`@@ -78,4 +79,8 @@ export function getLabelColor(): color.Color {`
`78`	`79`	`}`
`79`	`80`
`80`	`81`	`return labelColor;`
	`82`	`+}`
	`83`	`+`
	`84`	`+export function isDialogOptions(arg): boolean {`
	`85`	`+ return !types.isNullOrUndefined(arg) && (arg.message \|\| arg.title);`
`81`	`86`	`}`