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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2013-03-05 21:11:22 +01:00
commit 0ede62e8e9
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/server_status_monitor.js
View File

@ -557,7 +557,8 @@ AJAX.registerOnload('server_status_monitor.js', function() {
}
runtime.xmin = new Date().getTime() - server_time_diff - runtime.gridMaxPoints * monitorSettings.gridRefresh;
runtime.xmax = new Date().getTime() - server_time_diff + monitorSettings.gridRefresh;
// fixing chart shift towards left on refresh rate change
//runtime.xmax = new Date().getTime() - server_time_diff + monitorSettings.gridRefresh;
runtime.refreshTimeout = setTimeout(refreshChartGrid, monitorSettings.gridRefresh);
saveMonitor(); // Save settings

7
js/tbl_chart.js
View File

@ -266,7 +266,12 @@ function PMA_queryChart(data, columnNames, settings) {
label : settings.yaxisLabel
}
},
stackSeries : settings.stackSeries
stackSeries : settings.stackSeries,
highlighter: {
show: true,
showTooltip: true,
tooltipAxes: 'xy'
}
};
// create the chart

1
tbl_chart.php
View File

@ -79,6 +79,7 @@ $scripts->addFile('jqplot/plugins/jqplot.categoryAxisRenderer.js');
$scripts->addFile('jqplot/plugins/jqplot.dateAxisRenderer.js');
$scripts->addFile('jqplot/plugins/jqplot.pointLabels.js');
$scripts->addFile('jqplot/plugins/jqplot.pieRenderer.js');
$scripts->addFile('jqplot/plugins/jqplot.highlighter.js');
/* < IE 9 doesn't support canvas natively */
if (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER < 9) {
$scripts->addFile('canvg/flashcanvas.js');