gnucash maint: Bug 779411 - jqplot fixes for piechart and syntax error.

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/43e4b7ff (commit)
	from  https://github.com/Gnucash/gnucash/commit/9144edb4 (commit)



commit 43e4b7ff70e328c19e85d79d9bbf87ccc943a2ac
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Sat Mar 11 11:51:32 2017 +0000

    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.

diff --git a/src/report/report-system/html-piechart.scm b/src/report/report-system/html-piechart.scm
index 7bff905..0194c55 100644
--- a/src/report/report-system/html-piechart.scm
+++ b/src/report/report-system/html-piechart.scm
@@ -238,6 +238,10 @@
                     legend: {
                          show: true,
                          placement: \"outsideGrid\", },
+                    highlighter: {
+                         show: false },
+                    cursor: {
+                         showTooltip: false },
                    };\n")
 
             (if title
diff --git a/src/report/report-system/report.scm b/src/report/report-system/report.scm
index 43b11f5..453ad79 100644
--- a/src/report/report-system/report.scm
+++ b/src/report/report-system/report.scm
@@ -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))



Summary of changes:
 src/report/report-system/html-piechart.scm | 4 ++++
 src/report/report-system/report.scm        | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)