Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMadhura Jayaratne <madhura.cj@gmail.com>2013-12-24 21:39:59 +0400
committerMadhura Jayaratne <madhura.cj@gmail.com>2013-12-24 21:39:59 +0400
commit90620746731d6aa21a28b3329d3f2c7c508f5102 (patch)
tree2f4ea2d84cab3cf967aa0dfe4776713a30ef8011 /js/tbl_chart.js
parent094313412dc5cbc1c43befffc80a8d724aead1d8 (diff)
Add scatter charts
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Diffstat (limited to 'js/tbl_chart.js')
-rw-r--r--js/tbl_chart.js15
1 files changed, 15 insertions, 0 deletions
diff --git a/js/tbl_chart.js b/js/tbl_chart.js
index 3e11725aca..fea2ff8b28 100644
--- a/js/tbl_chart.js
+++ b/js/tbl_chart.js
@@ -225,6 +225,12 @@ AJAX.registerOnload('tbl_chart.js', function () {
dateTimeCols.push(parseInt(v, 10));
});
+ var numericCols = [];
+ var vals = $('input[name="numericCols"]').val().split(' ');
+ $.each(vals, function (i, v) {
+ numericCols.push(parseInt(v, 10));
+ });
+
// handle changing the x-axis
$('select[name="chartXAxis"]').change(function () {
currentSettings.mainAxis = parseInt($(this).val(), 10);
@@ -237,6 +243,15 @@ AJAX.registerOnload('tbl_chart.js', function () {
currentSettings.type = 'line';
}
}
+ if (numericCols.indexOf(currentSettings.mainAxis) != -1) {
+ $('span.span_scatter').show();
+ } else {
+ $('span.span_scatter').hide();
+ if (currentSettings.type == 'scatter') {
+ $('input#radio_line').prop('checked', true);
+ currentSettings.type = 'line';
+ }
+ }
var xaxis_title = $(this).children('option:selected').text();
$('input[name="xaxis_label"]').val(xaxis_title);
currentSettings.xaxisLabel = xaxis_title;