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-12-25 16:53:18 +01:00
commit 1f889db654
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/chart.js
View File

@ -414,14 +414,13 @@ JQPlotScatterChart.prototype.prepareData = function (dataTable) {
for (var i = 0; i < data.length; i++) {
row = data[i];
if (row[0]) {
var x = parseFloat(row[0]);
for (var j = 1; j < row.length; j++) {
retRow = retData[j - 1];
if (retRow === undefined) {
retRow = [];
retData[j - 1] = retRow;
}
retRow.push([x, row[j]]);
retRow.push([row[0], row[j]]);
}
}
}

2
js/tbl_chart.js
View File

@ -92,6 +92,8 @@ function PMA_queryChart(data, columnNames, settings) {
if (j === 0) {
if (settings.type == 'timeline') { // first column is date type
newRow.push(extractDate(row[col]));
} else if (settings.type == 'scatter') {
newRow.push(parseFloat(row[col]));
} else { // first column is string type
newRow.push(row[col]);
}