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

Merge branch 'QA_5_2'

Browse Source 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2023-03-04 19:24:54 -03:00
commit 7d360523dc
No known key found for this signature in database
GPG Key ID: 6A16FD38AFC89CC8
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
js/src/export.js
View File

@ -764,16 +764,22 @@ Export.checkTimeOut = function (timeLimit) {
limit = limit + 1;
clearTimeout(timeOut);
timeOut = setTimeout(function () {
$.get('index.php?route=/export/check-time-out', { 'ajax_request': true }, function (data) {
if (data.message === 'timeout') {
ajaxShowMessage(
'<div class="alert alert-danger" role="alert">' +
window.Messages.strTimeOutError +
'</div>',
false
);
$.get('index.php?route=/export/check-time-out',
{
'ajax_request': true,
'server': CommonParams.get('server')
},
function (data) {
if (data.message === 'timeout') {
ajaxShowMessage(
'<div class="alert alert-danger" role="alert">' +
window.Messages.strTimeOutError +
'</div>',
false
);
}
}
});
);
}, limit * 1000);
};

3
js/src/modules/themes-manager.js
View File

@ -1,11 +1,12 @@
import $ from 'jquery';
import { CommonParams } from './common';
/**
* @see https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/addEventListener
*/
export const ThemesManager = {
handleEvent: () => {
$.get('index.php?route=/themes', data => {
$.get('index.php?route=/themes', { 'server': CommonParams.get('server') }, data => {
$('#themesModal .modal-body').html(data.themes);
});
}