diff --git a/ChangeLog b/ChangeLog index 545ba206f5..28f75ddda2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog - bug #4610 JS error reporting: Hash fragment is reset - bug Undefined index menuswork - bug #4614 Separator between "Show All" and "Number of rows" disappears +- bug #4615 SQL highlighting in process list breaks on auto refresh 4.3.0.0 (not yet released) + rfe #1502 Smart sorting for int keys diff --git a/js/server_status_processes.js b/js/server_status_processes.js index 2777ad64e7..30be1af686 100644 --- a/js/server_status_processes.js +++ b/js/server_status_processes.js @@ -93,6 +93,7 @@ var processList = { if (data.hasOwnProperty('success') && data.success) { $newTable = $(data.message); $('#tableprocesslist').html($newTable.html()); + PMA_highlightSQL($('#tableprocesslist')); } processList.refreshTimeout = setTimeout( processList.refresh, diff --git a/js/sql.js b/js/sql.js index d0060909f1..c442b3ab3c 100644 --- a/js/sql.js +++ b/js/sql.js @@ -103,7 +103,7 @@ AJAX.registerTeardown('sql.js', function () { $('body').off('click','a.browse_foreign'); $('body').off('click', '#simulate_dml'); $('body').off('keyup', '#sqlqueryform'); - $('body').off('click', '#resultsForm.ajax button[name="submit_mult"], #resultsForm.ajax input[name="submit_mult"]'); + $('body').off('click', 'form[name="resultsForm"].ajax button[name="submit_mult"], form[name="resultsForm"].ajax input[name="submit_mult"]'); }); /** @@ -528,7 +528,7 @@ AJAX.registerOnload('sql.js', function () { /** * Handles multi submits of results browsing page such as edit, delete and export */ - $('body').on('click', '#resultsForm.ajax button[name="submit_mult"], #resultsForm.ajax input[name="submit_mult"]', function (e) { + $('body').on('click', 'form[name="resultsForm"].ajax button[name="submit_mult"], form[name="resultsForm"].ajax input[name="submit_mult"]', function (e) { e.preventDefault(); var $button = $(this); var $form = $button.parent('form');