Merge remote-tracking branch 'origin/pull/13330'

This commit is contained in:
Michal Čihař 2017-06-28 15:00:02 +02:00
commit 1f7f44c0c0
2 changed files with 11 additions and 6 deletions

View File

@ -173,6 +173,14 @@ AJAX.registerOnload('server_status_processes.js', function() {
$('#tableprocesslist').on('click', 'thead a', function() {
processList.refreshUrl = $(this).attr('href');
});
// Bind event handlers for toggling sort icons
$('#tableprocesslist').on('mouseover', 'thead a', function() {
$(this).find('.soimg').toggle();
});
$('#tableprocesslist').on('mouseout', 'thead a', function() {
$(this).find('.soimg').toggle();
});
});
/**
@ -183,6 +191,8 @@ AJAX.registerTeardown('server_status_processes.js', function() {
$('a#toggleRefresh').off('click');
$('#id_refreshRate').off('change');
$('#tableprocesslist').off('click', 'thead a');
$('#tableprocesslist').off('mouseover', 'thead a');
$('#tableprocesslist').off('mouseout', 'thead a');
// stop refreshing further
processList.abortRefresh();
});

View File

@ -144,12 +144,7 @@ function PMA_getHtmlForServerProcesslist()
$retval .= '<th>';
$columnUrl = URL::getCommon($column);
$retval .= '<a href="server_status_processes.php' . $columnUrl . '" ';
if ($is_sorted) {
$retval .= 'onmouseout="$(\'.soimg\').toggle()" '
. 'onmouseover="$(\'.soimg\').toggle()"';
}
$retval .= '>';
$retval .= '<a href="server_status_processes.php' . $columnUrl . '">';
$retval .= $column['column_name'];