Bug 779411 - jqplot fixes for piechart and syntax error.

With the piechart in combination with other charts you have to set the
highlighter and cursor show tooltip to false which stops seen errors.

The syntax errors are caused by only removing the duplicated js files
and not the whole path so changed that to remove whole line.
This commit is contained in:
Robert Fewell 2017-03-11 11:51:32 +00:00 committed by Geert Janssens
parent 9144edb464
commit 43e4b7ff70
2 changed files with 6 additions and 2 deletions

View File

@ -238,6 +238,10 @@
legend: {
show: true,
placement: \"outsideGrid\", },
highlighter: {
show: false },
cursor: {
showTooltip: false },
};\n")
(if title

View File

@ -755,8 +755,8 @@
(if report
(begin
(set! html (gnc:report-render-html report #t))
(set! html (gnc:substring-replace-from-to html "jquery.min.js" "" 2 -1))
(set! html (gnc:substring-replace-from-to html "jquery.jqplot.js" "" 2 -1))
(set! html (gnc:substring-replace-from-to html (gnc:html-js-include "jqplot/jquery.min.js") "" 2 -1))
(set! html (gnc:substring-replace-from-to html (gnc:html-js-include "jqplot/jquery.jqplot.js") "" 2 -1))
))))
(gnc-unset-busy-cursor '())
html))