diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index bfdf7b6adc..6c4021a534 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -1207,12 +1207,13 @@ AJAX.registerOnload('server_status_monitor.js', function () { ) { settings.axes.yaxis.tickOptions = { formatter: function (format, val) { - if (Math.abs(val) >= 1000000) + if (Math.abs(val) >= 1000000) { return $.jqplot.sprintf("%.3g M", val/1000000); - else if (Math.abs(val) >= 1000) + } else if (Math.abs(val) >= 1000) { return $.jqplot.sprintf("%.3g k", val/1000); - else + } else { return $.jqplot.sprintf("%d", val); + } } }; } @@ -2141,8 +2142,9 @@ AJAX.registerOnload('server_status_monitor.js', function () { data = data.message; } if (data.error) { - if(data.error.indexOf('1146') != -1 || data.error.indexOf('1046') != -1) + if(data.error.indexOf('1146') != -1 || data.error.indexOf('1046') != -1) { data.error = PMA_messages['strServerLogError']; + } $('#queryAnalyzerDialog div.placeHolder').html('
' + data.error + '
'); return; }