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

Merge branch 'QA_3_5'

Browse Source
This commit is contained in:
Marc Delisle 2012-09-11 12:42:56 -04:00
commit cca2aa268b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/server_status.js
View File

@ -481,7 +481,6 @@ $(function() {
.hide()
.after('<div class="liveChart" id="' + $tab.attr('id') + '_chart_cnt"></div>');
}
tabChart[$tab.attr('id')] = PMA_createChart(settings);
$(link).html(PMA_messages['strStaticData']);
$tab.find('.buttonlinks a.tabRefresh').hide();
$tab.find('.buttonlinks .refreshList').show();

3
js/server_status_monitor.js
View File

@ -477,7 +477,8 @@ $(function() {
runtime.xmax = new Date().getTime() - server_time_diff + monitorSettings.gridRefresh;
$.each(runtime.charts, function(key, value) {
value.chart.xAxis[0].setExtremes(runtime.xmin, runtime.xmax, false);
value.chart['axes']['xaxis']['max'] = runtime.xmax;
value.chart['axes']['xaxis']['min'] = runtime.xmin;
});
runtime.refreshTimeout = setTimeout(refreshChartGrid, monitorSettings.gridRefresh);