gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor Functions.confirm() function

Browse Source 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2023-04-11 18:30:02 -03:00
parent e104f66d97
commit 22ac8c9bec
No known key found for this signature in database
GPG Key ID: 6A16FD38AFC89CC8
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/database/qbe.ts
View File

@ -75,7 +75,7 @@ AJAX.registerOnload('database/qbe.js', function () {
*/
$(document).on('click', '#deleteSearch', function () {
var question = window.sprintf(window.Messages.strConfirmDeleteQBESearch, $('#searchId').find('option:selected').text());
if (! confirm(question)) {
if (! window.confirm(question)) {
return false;
}

22
js/src/modules/functions.ts
View File

@ -503,7 +503,7 @@ function confirmLink (theLink, theSqlQuery) {
return true;
}
var isConfirmed = confirm(window.sprintf(window.Messages.strDoYouReally, theSqlQuery));
var isConfirmed = window.confirm(window.sprintf(window.Messages.strDoYouReally, theSqlQuery));
if (isConfirmed) {
if (typeof (theLink.href) !== 'undefined') {
theLink.href += CommonParams.get('arg_separator') + 'is_js_confirmed=1';
@ -558,7 +558,7 @@ function confirmQuery (theForm1, sqlQuery1) {
message = sqlQuery1;
}
var isConfirmed = confirm(window.sprintf(window.Messages.strDoYouReally, message));
var isConfirmed = window.confirm(window.sprintf(window.Messages.strDoYouReally, message));
// statement is confirmed -> update the
// "is_js_confirmed" form field so the confirm test won't be
// run on the server side and allows to submit the form
@ -1424,7 +1424,7 @@ function checkReservedWordColumns ($form) {
data: $form.serialize(),
success: function (data) {
if (typeof data.success !== 'undefined' && data.success === true) {
isConfirmed = confirm(data.message);
isConfirmed = window.confirm(data.message);
}
},
async: false
@ -1746,7 +1746,7 @@ function sqlPrettyPrint (string) {
*
* @return {boolean}
*/
function confirm (question, url = undefined, callbackFn = undefined, openCallback = undefined) {
function confirmDialog (question, url = undefined, callbackFn = undefined, openCallback = undefined) {
var confirmState = CommonParams.get('confirm');
if (! confirmState) {
// user does not want to confirm
@ -1761,10 +1761,14 @@ function confirm (question, url = undefined, callbackFn = undefined, openCallbac
return true;
}
$('#functionConfirmModal').modal('show');
$('#functionConfirmModal').find('.modal-body').first().html(question);
$('#functionConfirmOkButton').off('click');// Un-register previous modals
$('#functionConfirmOkButton').on('click', function () {
const functionConfirmModal = $('#functionConfirmModal') as JQuery<HTMLDivElement>;
functionConfirmModal.modal('show');
functionConfirmModal.find('.modal-body').first().html(question);
const functionConfirmOkButton = $('#functionConfirmOkButton') as JQuery<HTMLButtonElement>;
functionConfirmOkButton.off('click');// Un-register previous modals
functionConfirmOkButton.on('click', function () {
functionConfirmModal.modal('hide');
if (typeof callbackFn === 'function') {
callbackFn.call(this, url);
}
@ -3773,7 +3777,7 @@ const Functions = {
showWarningForIntTypes: showWarningForIntTypes,
prettyProfilingNum: prettyProfilingNum,
sqlPrettyPrint: sqlPrettyPrint,
confirm: confirm,
confirm: confirmDialog,
sortTable: sortTable,
teardownCreateTableEvents: teardownCreateTableEvents,
onloadCreateTableEvents: onloadCreateTableEvents,

2
templates/modals/function_confirm.twig
View File

@ -7,7 +7,7 @@
</div>
<div class="modal-body"></div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" id="functionConfirmOkButton" data-bs-dismiss="modal">{% trans 'Ok' %}</button>
<button type="button" class="btn btn-secondary" id="functionConfirmOkButton">{% trans 'Ok' %}</button>
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{% trans 'Close' %}</button>
</div>
</div>