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

alert. confirm and prompt options combined. defaultText now part of the confirm method signature

Browse Source
This commit is contained in:
Vladimir Enchev
2014-06-09 14:24:10 +03:00
parent 947c35d6b4
commit 63768427ba
3 changed files with 26 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,8 @@ import appmodule = require("application");
import view = require("ui/core/view");
var STRING = "string",
PROMPT = "Prompt",
CONFIRM = "Confirm",
ALERT = "Alert",
OK = "OK",
CANCEL = "Cancel";
@@ -18,7 +20,7 @@ function createAlertDialog(message: string, options: dialogs.DialogOptions): and
return alert;
}
function addButtonsToAlertDialog(alert: android.app.AlertDialog.Builder, options: dialogs.ConfirmOptions,
function addButtonsToAlertDialog(alert: android.app.AlertDialog.Builder, options: dialogs.DialogButtonOptions,
okCallback: Function, cancelCallback?: Function, neutralCallback?: Function): void {
if (options.okButtonText) {
@@ -41,8 +43,8 @@ function addButtonsToAlertDialog(alert: android.app.AlertDialog.Builder, options
}));
}
if (options.otherButtonText) {
alert.setNeutralButton(options.otherButtonText, new android.content.DialogInterface.OnClickListener({
if (options.neutralButtonText) {
alert.setNeutralButton(options.neutralButtonText, new android.content.DialogInterface.OnClickListener({
onClick: function (dialog: android.content.DialogInterface, id: number) {
dialog.cancel();
if (neutralCallback) {
@@ -53,12 +55,12 @@ function addButtonsToAlertDialog(alert: android.app.AlertDialog.Builder, options
}
}
export function alert(message: string, options = { title: ALERT, buttonText: OK }): promises.Promise<void> {
export function alert(message: string, options = { title: ALERT, okButtonText: OK }): promises.Promise<void> {
var d = promises.defer<void>();
try {
var alert = createAlertDialog(message, options);
alert.setPositiveButton(options.buttonText, new android.content.DialogInterface.OnClickListener({
alert.setPositiveButton(options.okButtonText, new android.content.DialogInterface.OnClickListener({
onClick: function (dialog: android.content.DialogInterface, id: number) {
dialog.cancel();
d.resolve();
@@ -74,7 +76,7 @@ export function alert(message: string, options = { title: ALERT, buttonText: OK
return d.promise();
}
export function confirm(message: string, options = { title: ALERT, okButtonText: OK, cancelButtonText: CANCEL }): promises.Promise<boolean> {
export function confirm(message: string, options = { title: CONFIRM, okButtonText: OK, cancelButtonText: CANCEL }): promises.Promise<boolean> {
var d = promises.defer<boolean>();
try {
var alert = createAlertDialog(message, options);
@@ -90,13 +92,13 @@ export function confirm(message: string, options = { title: ALERT, okButtonText:
return d.promise();
}
export function prompt(message: string, options = { title: ALERT, okButtonText: OK, cancelButtonText: CANCEL, defaultText: "" }): promises.Promise<dialogs.PromptResult> {
export function prompt(message: string, defaultText?: string, options = { title: PROMPT, okButtonText: OK, cancelButtonText: CANCEL }): promises.Promise<dialogs.PromptResult> {
var d = promises.defer<dialogs.PromptResult>();
try {
var alert = createAlertDialog(message, options);
var input = new android.widget.EditText(appmodule.android.context);
input.setText(options.defaultText ? options.defaultText : "");
input.setText(defaultText ? defaultText : "");
alert.setView(input);