From 669c25d0a1ce75910a4c91e7fde24b4c1e428c03 Mon Sep 17 00:00:00 2001
From: Rafael Ostertag <rafael.ostertag@math.uzh.ch>
Date: Wed, 11 May 2016 08:45:43 +0200
Subject: [PATCH] Added default focus for alerts, in manner, that prevents the
user from loosing data.
---
javascript/src/FileDelete.js | 2 +-
javascript/src/QfqForm.js | 6 +++---
javascript/src/QfqRecordList.js | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/javascript/src/FileDelete.js b/javascript/src/FileDelete.js
index bf699d593..e7bd93364 100644
--- a/javascript/src/FileDelete.js
+++ b/javascript/src/FileDelete.js
@@ -29,7 +29,7 @@ var QfqNS = QfqNS || {};
event.preventDefault();
var alert = new n.Alert("Do you want to delete the file?",
"warning",
- [{label: "OK", eventName: "ok"}, {label: "Cancel", eventName: "cancel"}]);
+ [{label: "OK", eventName: "ok"}, {label: "Cancel", eventName: "cancel", focus: true}]);
alert.on('alert.ok', function () {
this.performFileDelete(event);
}.bind(this));
diff --git a/javascript/src/QfqForm.js b/javascript/src/QfqForm.js
index 949da51fb..16a547879 100644
--- a/javascript/src/QfqForm.js
+++ b/javascript/src/QfqForm.js
@@ -288,7 +288,7 @@ var QfqNS = QfqNS || {};
this.lastButtonPress = "close";
if (this.form.getFormChanged()) {
var alert = new n.Alert("You have unsaved changes. Do you want to close?", "warning",
- [{label: "Yes", eventName: "ok"}, {label: "No", eventName: "no"}, {
+ [{label: "Yes", eventName: "ok"}, {label: "No", eventName: "no", focus: true}, {
label: "Save & Close",
eventName: "save"
}]);
@@ -339,7 +339,7 @@ var QfqNS = QfqNS || {};
var alert = new n.Alert("You have unsaved changes. Do you want to close?", "warning",
[
{label: "Yes", eventName: "ok"},
- {label: "No", eventName: "cancel"},
+ {label: "No", eventName: "cancel", focus: true},
{label: "Save & Close", eventName: "save"}
]);
var that = this;
@@ -367,7 +367,7 @@ var QfqNS = QfqNS || {};
var alert = new n.Alert("Do you really want to delete the record?", "warning",
[
{label: "Yes", eventName: "ok"},
- {label: "No", eventName: "cancel"}
+ {label: "No", eventName: "cancel", focus: true}
]);
var that = this;
alert.on('alert.ok', function () {
diff --git a/javascript/src/QfqRecordList.js b/javascript/src/QfqRecordList.js
index 0dba04fe4..68e01e6b9 100644
--- a/javascript/src/QfqRecordList.js
+++ b/javascript/src/QfqRecordList.js
@@ -43,7 +43,7 @@ var QfqNS = QfqNS || {};
var alert = new n.Alert("Do you really want to delete the record?", "warning",
[
{label: "Yes", eventName: "ok"},
- {label: "No", eventName: "cancel"}
+ {label: "No", eventName: "cancel", focus: true}
]);
var that = this;
alert.on('alert.ok', function () {
--
GitLab