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

Merge pull request #19332 from liviuconcioiu/18170

Browse Source 
Fix #18170 - window.makeGrid is not a function
This commit is contained in:
Maurício Meneghini Fauth 2024-10-29 14:00:39 -03:00 committed by GitHub
commit 4b748b6fc0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/src/sql.js
View File

@ -189,7 +189,7 @@ AJAX.registerTeardown('sql.js', function () {
$(document).off('click', 'a.delete_row.ajax');
$(document).off('submit', '.bookmarkQueryForm');
$('input#bkm_label').off('input');
$(document).off('makegrid', '.sqlqueryresults');
$(document).off('makeGrid', '.sqlqueryresults');
$('#togglequerybox').off('click');
$(document).off('click', '#button_submit_query');
$(document).off('change', '#id_bookmark');
@ -401,11 +401,11 @@ AJAX.registerOnload('sql.js', function () {
}); // end of Copy to Clipboard action
/**
* Attach the {@link makegrid} function to a custom event, which will be
* Attach the {@link makeGrid} function to a custom event, which will be
* triggered manually everytime the table of results is reloaded
* @memberOf jQuery
*/
$(document).on('makegrid', '.sqlqueryresults', function () {
$(document).on('makeGrid', '.sqlqueryresults', function () {
$('.table_results').each(function () {
makeGrid(this);
});
@ -625,7 +625,7 @@ AJAX.registerOnload('sql.js', function () {
});
}
$('.sqlqueryresults').trigger('makegrid');
$('.sqlqueryresults').trigger('makeGrid');
$('#togglequerybox').show();
if (typeof data.action_bookmark === 'undefined') {
@ -663,7 +663,7 @@ AJAX.registerOnload('sql.js', function () {
var $sqlqueryresults = $form.parents('.sqlqueryresults');
$sqlqueryresults
.html(data.message)
.trigger('makegrid');
.trigger('makeGrid');
Functions.highlightSql($sqlqueryresults);
}); // end $.post()
}); // end displayOptionsForm handler
@ -1014,7 +1014,7 @@ AJAX.registerOnload('sql.js', function () {
/**
* create resizable table
*/
$('.sqlqueryresults').trigger('makegrid');
$('.sqlqueryresults').trigger('makeGrid');
/**
* Check if there is any saved query

2
js/src/table/select.js
View File

@ -161,7 +161,7 @@ AJAX.registerOnload('table/select.js', function () {
$('#sqlqueryresultsouter').html(data.sql_query);
} else { // results found
$('#sqlqueryresultsouter').html(data.message);
$('.sqlqueryresults').trigger('makegrid');
$('.sqlqueryresults').trigger('makeGrid');
}
$('#tbl_search_form')
// workaround for bug #3168569 - Issue on toggling the "Hide search criteria" in chrome.