From 43e4b7ff70e328c19e85d79d9bbf87ccc943a2ac Mon Sep 17 00:00:00 2001
From: Robert Fewell <14uBobIT@gmail.com>
Date: Sat, 11 Mar 2017 11:51:32 +0000
Subject: [PATCH] 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.
---
 src/report/report-system/html-piechart.scm | 4 ++++
 src/report/report-system/report.scm        | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/report/report-system/html-piechart.scm b/src/report/report-system/html-piechart.scm
index 7bff9051c8..0194c55d3b 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 43b11f5ef3..453ad79c3e 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))