javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1086 from NathanaelA/DialogBox_Fixes

Browse Source 
This will now allow the dialog to call the resolve function when cancelled by clicking outside.
This commit is contained in:
Vladimir Enchev
2015-11-17 10:28:20 +02:00
parent 2026526d18 77f3008c5c
commit 3cf3dccdfc
2 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ui/dialogs/dialogs.android.ts
View File

@@ -13,6 +13,9 @@ function createAlertDialog(options?: dialogs.DialogOptions): android.app.AlertDi
var alert = new android.app.AlertDialog.Builder(appmodule.android.foregroundActivity);
alert.setTitle(options && types.isString(options.title) ? options.title : "");
alert.setMessage(options && types.isString(options.message) ? options.message : "");
if (options && options.cancelable === false) {
alert.setCancelable(false);
}
return alert;
}
@@ -72,6 +75,11 @@ function addButtonsToAlertDialog(alert: android.app.AlertDialog.Builder, options
}
}));
}
alert.setOnDismissListener(new android.content.DialogInterface.OnDismissListener({
onDismiss: function() {
callback(false);
}
}));
}
export function alert(arg: any): Promise<void> {
@@ -87,6 +95,11 @@ export function alert(arg: any): Promise<void> {
resolve();
}
}));
alert.setOnDismissListener(new android.content.DialogInterface.OnDismissListener({
onDismiss: function() {
resolve();
}
}));
showDialog(alert);
@@ -262,6 +275,9 @@ export function action(arg: any): Promise<string> {
var alert = new android.app.AlertDialog.Builder(activity);
var message = options && types.isString(options.message) ? options.message : "";
var title = options && types.isString(options.title) ? options.title : "";
if (options && options.cancelable === false) {
alert.setCancelable(false);
}
if (title) {
alert.setTitle(title);
@@ -289,6 +305,17 @@ export function action(arg: any): Promise<string> {
}
}));
}
alert.setOnDismissListener(new android.content.DialogInterface.OnDismissListener({
onDismiss: function() {
if (types.isString(options.cancelButtonText)) {
resolve(options.cancelButtonText);
} else {
resolve("");
}
}
}));
showDialog(alert);
} catch (ex) {

15
ui/dialogs/dialogs.d.ts vendored
View File

@@ -85,7 +85,17 @@ declare module "ui/dialogs" {
/**
* Provides options for the dialog.
*/
export interface ActionOptions {
export interface CancelableOptions {
/**
* [Android only] Gets or sets if the dialog can be canceled by taping outside of the dialog.
*/
cancelable?: boolean;
}
/**
* Provides options for the dialog.
*/
export interface ActionOptions extends CancelableOptions {
/**
* Gets or sets the dialog title.
*/
@@ -110,7 +120,7 @@ declare module "ui/dialogs" {
/**
* Provides options for the dialog.
*/
export interface DialogOptions {
export interface DialogOptions extends CancelableOptions {
/**
* Gets or sets the dialog title.
*/
@@ -120,6 +130,7 @@ declare module "ui/dialogs" {
* Gets or sets the dialog message.
*/
message?: string;
}
/**