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

Coding style: use {} for if statements

Browse Source
This commit is contained in:
Michal Čihař 2013-09-30 11:22:24 +02:00
parent 65aa3af8ff
commit 501cb5a743
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/server_status_monitor.js
View File

@ -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('<div class="error">' + data.error + '</div>');
return;
}