diff options
| author | Michal Čihař <mcihar@suse.cz> | 2013-01-15 12:14:17 +0400 |
|---|---|---|
| committer | Michal Čihař <mcihar@suse.cz> | 2013-01-15 12:14:17 +0400 |
| commit | 077a93b0e256421a0cdf60392adef06283454fac (patch) | |
| tree | 008bf63e10c440d37e533a412026adbbeda47d59 /js/tbl_chart.js | |
| parent | 7463acbe9fe521380ed9ea47f064af8b2b859f85 (diff) | |
| parent | 7ddc71c033256baad76957c42fc1b9ad83bac8e7 (diff) | |
Merge remote-tracking branch 'origin/QA_3_5'
Conflicts:
js/tbl_chart.js
Diffstat (limited to 'js/tbl_chart.js')
| -rw-r--r-- | js/tbl_chart.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/tbl_chart.js b/js/tbl_chart.js index 758cea0505..235e5d50c9 100644 --- a/js/tbl_chart.js +++ b/js/tbl_chart.js @@ -70,8 +70,8 @@ AJAX.registerOnload('tbl_chart.js', function() { } }, title: { - text: $('input[name="chartTitle"]').attr('value') - escapeHtml: true, + text: $('input[name="chartTitle"]').attr('value'), + escapeHtml: true //margin:20 }, legend: { @@ -287,8 +287,8 @@ function PMA_queryChart(data, passedSettings, passedNonJqplotSettings) var settings = { title: { - escapeHtml: true, - text: '' + text: '', + escapeHtml: true //margin:20 } }; |