gnucash master: Multiple changes pushed

[Christopher Lam]

Updated	 via  https://github.com/Gnucash/gnucash/commit/7102b1d2 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/d90f843a (commit)
	from  https://github.com/Gnucash/gnucash/commit/4b21244d (commit)



commit 7102b1d2f05b3139869ae713a69cb32bbda399b8
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Tue Jun 18 18:24:46 2019 +0800

    [html-chart] use gnc:html-js-include to import js
    
    This fix url to file:/// for windows to render charts properly.

diff --git a/gnucash/report/report-system/html-chart.scm b/gnucash/report/report-system/html-chart.scm
index 635d7563f..35f73abb8 100644
--- a/gnucash/report/report-system/html-chart.scm
+++ b/gnucash/report/report-system/html-chart.scm
@@ -452,8 +452,8 @@ document.getElementById(chartid).onclick = function(evt) {
          ;; clashing on multi-column reports
          (id (guid-new-return)))
 
-    (push (format #f "<script language='javascript' type='text/javascript' src='file://~a'></script>\n"
-                  (gnc-path-find-localized-html-file "chartjs/Chart.bundle.min.js")))
+    (push (gnc:html-js-include
+           (gnc-path-find-localized-html-file "chartjs/Chart.bundle.min.js")))
 
     (push (format #f "<div style='width:~a;height:~a;'>\n"
                   (size->str (gnc:html-chart-width chart))

commit d90f843a1aea0af94012c684db3aee0264ec15c1
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sun Jun 16 22:18:01 2019 +0800

    [html-chart] use guid generator instead of random
    
    guid is *guaranteed* to be unique, unlike random...

diff --git a/gnucash/report/report-system/html-chart.scm b/gnucash/report/report-system/html-chart.scm
index 55cfe6229..635d7563f 100644
--- a/gnucash/report/report-system/html-chart.scm
+++ b/gnucash/report/report-system/html-chart.scm
@@ -450,7 +450,7 @@ document.getElementById(chartid).onclick = function(evt) {
          (push (lambda (l) (set! retval (cons l retval))))
          ;; Use a unique chart-id for each chart. This prevents charts
          ;; clashing on multi-column reports
-         (id (random 99999999)))
+         (id (guid-new-return)))
 
     (push (format #f "<script language='javascript' type='text/javascript' src='file://~a'></script>\n"
                   (gnc-path-find-localized-html-file "chartjs/Chart.bundle.min.js")))



Summary of changes:
 gnucash/report/report-system/html-chart.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)