diff --git a/borrowed/CMakeLists.txt b/borrowed/CMakeLists.txt index 67dc25502f..1ed081546f 100644 --- a/borrowed/CMakeLists.txt +++ b/borrowed/CMakeLists.txt @@ -1,12 +1,12 @@ add_subdirectory(libc) add_subdirectory(goffice) -add_subdirectory(chartjs) +add_subdirectory(chartjs-2) add_subdirectory(guile-json) set_local_dist(borrowed_DIST_local jenny/jenny.c CMakeLists.txt README) set(borrowed_DIST ${borrowed_DIST_local} - ${chartjs_DIST} + ${chartjs-2_DIST} ${libc_DIST} ${guile-json_DIST} ${goffice_DIST} diff --git a/borrowed/chartjs-2/CMakeLists.txt b/borrowed/chartjs-2/CMakeLists.txt new file mode 100644 index 0000000000..b23cf12900 --- /dev/null +++ b/borrowed/chartjs-2/CMakeLists.txt @@ -0,0 +1,15 @@ + +set(chartjs-2_DATA + Chart.bundle.min.js + Chart.bundle.js +) + +file(GLOB_RECURSE chartjs-2_NOINST_DATA + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + samples Chart*) + +list(REMOVE_ITEM chartjs-2_NOINST_DATA ${chartjs-2_DATA}) + +install (FILES ${chartjs-2_DATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/chartjs-2) + +set_dist_list(chartjs-2_DIST CMakeLists.txt ${chartjs-2_DATA} ${chartjs-2_NOINST_DATA}) diff --git a/borrowed/chartjs/Chart.bundle.js b/borrowed/chartjs-2/Chart.bundle.js similarity index 100% rename from borrowed/chartjs/Chart.bundle.js rename to borrowed/chartjs-2/Chart.bundle.js diff --git a/borrowed/chartjs/Chart.bundle.min.js b/borrowed/chartjs-2/Chart.bundle.min.js similarity index 100% rename from borrowed/chartjs/Chart.bundle.min.js rename to borrowed/chartjs-2/Chart.bundle.min.js diff --git a/borrowed/chartjs/Chart.css b/borrowed/chartjs-2/Chart.css similarity index 100% rename from borrowed/chartjs/Chart.css rename to borrowed/chartjs-2/Chart.css diff --git a/borrowed/chartjs/Chart.js b/borrowed/chartjs-2/Chart.js similarity index 100% rename from borrowed/chartjs/Chart.js rename to borrowed/chartjs-2/Chart.js diff --git a/borrowed/chartjs/Chart.min.css b/borrowed/chartjs-2/Chart.min.css similarity index 100% rename from borrowed/chartjs/Chart.min.css rename to borrowed/chartjs-2/Chart.min.css diff --git a/borrowed/chartjs/Chart.min.js b/borrowed/chartjs-2/Chart.min.js similarity index 100% rename from borrowed/chartjs/Chart.min.js rename to borrowed/chartjs-2/Chart.min.js diff --git a/borrowed/chartjs/LICENSE.md b/borrowed/chartjs-2/LICENSE.md similarity index 100% rename from borrowed/chartjs/LICENSE.md rename to borrowed/chartjs-2/LICENSE.md diff --git a/borrowed/chartjs/README.md b/borrowed/chartjs-2/README.md similarity index 100% rename from borrowed/chartjs/README.md rename to borrowed/chartjs-2/README.md diff --git a/borrowed/chartjs/samples/advanced/content-security-policy.css b/borrowed/chartjs-2/samples/advanced/content-security-policy.css similarity index 100% rename from borrowed/chartjs/samples/advanced/content-security-policy.css rename to borrowed/chartjs-2/samples/advanced/content-security-policy.css diff --git a/borrowed/chartjs/samples/advanced/content-security-policy.html b/borrowed/chartjs-2/samples/advanced/content-security-policy.html similarity index 100% rename from borrowed/chartjs/samples/advanced/content-security-policy.html rename to borrowed/chartjs-2/samples/advanced/content-security-policy.html diff --git a/borrowed/chartjs/samples/advanced/content-security-policy.js b/borrowed/chartjs-2/samples/advanced/content-security-policy.js similarity index 100% rename from borrowed/chartjs/samples/advanced/content-security-policy.js rename to borrowed/chartjs-2/samples/advanced/content-security-policy.js diff --git a/borrowed/chartjs/samples/advanced/data-labelling.html b/borrowed/chartjs-2/samples/advanced/data-labelling.html similarity index 100% rename from borrowed/chartjs/samples/advanced/data-labelling.html rename to borrowed/chartjs-2/samples/advanced/data-labelling.html diff --git a/borrowed/chartjs/samples/advanced/progress-bar.html b/borrowed/chartjs-2/samples/advanced/progress-bar.html similarity index 100% rename from borrowed/chartjs/samples/advanced/progress-bar.html rename to borrowed/chartjs-2/samples/advanced/progress-bar.html diff --git a/borrowed/chartjs/samples/charts/area/analyser.js b/borrowed/chartjs-2/samples/charts/area/analyser.js similarity index 100% rename from borrowed/chartjs/samples/charts/area/analyser.js rename to borrowed/chartjs-2/samples/charts/area/analyser.js diff --git a/borrowed/chartjs/samples/charts/area/line-boundaries.html b/borrowed/chartjs-2/samples/charts/area/line-boundaries.html similarity index 100% rename from borrowed/chartjs/samples/charts/area/line-boundaries.html rename to borrowed/chartjs-2/samples/charts/area/line-boundaries.html diff --git a/borrowed/chartjs/samples/charts/area/line-datasets.html b/borrowed/chartjs-2/samples/charts/area/line-datasets.html similarity index 100% rename from borrowed/chartjs/samples/charts/area/line-datasets.html rename to borrowed/chartjs-2/samples/charts/area/line-datasets.html diff --git a/borrowed/chartjs/samples/charts/area/line-stacked.html b/borrowed/chartjs-2/samples/charts/area/line-stacked.html similarity index 100% rename from borrowed/chartjs/samples/charts/area/line-stacked.html rename to borrowed/chartjs-2/samples/charts/area/line-stacked.html diff --git a/borrowed/chartjs/samples/charts/area/radar.html b/borrowed/chartjs-2/samples/charts/area/radar.html similarity index 100% rename from borrowed/chartjs/samples/charts/area/radar.html rename to borrowed/chartjs-2/samples/charts/area/radar.html diff --git a/borrowed/chartjs/samples/charts/bar/horizontal.html b/borrowed/chartjs-2/samples/charts/bar/horizontal.html similarity index 100% rename from borrowed/chartjs/samples/charts/bar/horizontal.html rename to borrowed/chartjs-2/samples/charts/bar/horizontal.html diff --git a/borrowed/chartjs/samples/charts/bar/multi-axis.html b/borrowed/chartjs-2/samples/charts/bar/multi-axis.html similarity index 100% rename from borrowed/chartjs/samples/charts/bar/multi-axis.html rename to borrowed/chartjs-2/samples/charts/bar/multi-axis.html diff --git a/borrowed/chartjs/samples/charts/bar/stacked-group.html b/borrowed/chartjs-2/samples/charts/bar/stacked-group.html similarity index 100% rename from borrowed/chartjs/samples/charts/bar/stacked-group.html rename to borrowed/chartjs-2/samples/charts/bar/stacked-group.html diff --git a/borrowed/chartjs/samples/charts/bar/stacked.html b/borrowed/chartjs-2/samples/charts/bar/stacked.html similarity index 100% rename from borrowed/chartjs/samples/charts/bar/stacked.html rename to borrowed/chartjs-2/samples/charts/bar/stacked.html diff --git a/borrowed/chartjs/samples/charts/bar/vertical.html b/borrowed/chartjs-2/samples/charts/bar/vertical.html similarity index 100% rename from borrowed/chartjs/samples/charts/bar/vertical.html rename to borrowed/chartjs-2/samples/charts/bar/vertical.html diff --git a/borrowed/chartjs/samples/charts/bubble.html b/borrowed/chartjs-2/samples/charts/bubble.html similarity index 100% rename from borrowed/chartjs/samples/charts/bubble.html rename to borrowed/chartjs-2/samples/charts/bubble.html diff --git a/borrowed/chartjs/samples/charts/combo-bar-line.html b/borrowed/chartjs-2/samples/charts/combo-bar-line.html similarity index 100% rename from borrowed/chartjs/samples/charts/combo-bar-line.html rename to borrowed/chartjs-2/samples/charts/combo-bar-line.html diff --git a/borrowed/chartjs/samples/charts/doughnut.html b/borrowed/chartjs-2/samples/charts/doughnut.html similarity index 100% rename from borrowed/chartjs/samples/charts/doughnut.html rename to borrowed/chartjs-2/samples/charts/doughnut.html diff --git a/borrowed/chartjs/samples/charts/line/basic.html b/borrowed/chartjs-2/samples/charts/line/basic.html similarity index 100% rename from borrowed/chartjs/samples/charts/line/basic.html rename to borrowed/chartjs-2/samples/charts/line/basic.html diff --git a/borrowed/chartjs/samples/charts/line/interpolation-modes.html b/borrowed/chartjs-2/samples/charts/line/interpolation-modes.html similarity index 100% rename from borrowed/chartjs/samples/charts/line/interpolation-modes.html rename to borrowed/chartjs-2/samples/charts/line/interpolation-modes.html diff --git a/borrowed/chartjs/samples/charts/line/line-styles.html b/borrowed/chartjs-2/samples/charts/line/line-styles.html similarity index 100% rename from borrowed/chartjs/samples/charts/line/line-styles.html rename to borrowed/chartjs-2/samples/charts/line/line-styles.html diff --git a/borrowed/chartjs/samples/charts/line/multi-axis.html b/borrowed/chartjs-2/samples/charts/line/multi-axis.html similarity index 100% rename from borrowed/chartjs/samples/charts/line/multi-axis.html rename to borrowed/chartjs-2/samples/charts/line/multi-axis.html diff --git a/borrowed/chartjs/samples/charts/line/point-sizes.html b/borrowed/chartjs-2/samples/charts/line/point-sizes.html similarity index 100% rename from borrowed/chartjs/samples/charts/line/point-sizes.html rename to borrowed/chartjs-2/samples/charts/line/point-sizes.html diff --git a/borrowed/chartjs/samples/charts/line/point-styles.html b/borrowed/chartjs-2/samples/charts/line/point-styles.html similarity index 100% rename from borrowed/chartjs/samples/charts/line/point-styles.html rename to borrowed/chartjs-2/samples/charts/line/point-styles.html diff --git a/borrowed/chartjs/samples/charts/line/skip-points.html b/borrowed/chartjs-2/samples/charts/line/skip-points.html similarity index 100% rename from borrowed/chartjs/samples/charts/line/skip-points.html rename to borrowed/chartjs-2/samples/charts/line/skip-points.html diff --git a/borrowed/chartjs/samples/charts/line/stepped.html b/borrowed/chartjs-2/samples/charts/line/stepped.html similarity index 100% rename from borrowed/chartjs/samples/charts/line/stepped.html rename to borrowed/chartjs-2/samples/charts/line/stepped.html diff --git a/borrowed/chartjs/samples/charts/pie.html b/borrowed/chartjs-2/samples/charts/pie.html similarity index 100% rename from borrowed/chartjs/samples/charts/pie.html rename to borrowed/chartjs-2/samples/charts/pie.html diff --git a/borrowed/chartjs/samples/charts/polar-area.html b/borrowed/chartjs-2/samples/charts/polar-area.html similarity index 100% rename from borrowed/chartjs/samples/charts/polar-area.html rename to borrowed/chartjs-2/samples/charts/polar-area.html diff --git a/borrowed/chartjs/samples/charts/radar-skip-points.html b/borrowed/chartjs-2/samples/charts/radar-skip-points.html similarity index 100% rename from borrowed/chartjs/samples/charts/radar-skip-points.html rename to borrowed/chartjs-2/samples/charts/radar-skip-points.html diff --git a/borrowed/chartjs/samples/charts/radar.html b/borrowed/chartjs-2/samples/charts/radar.html similarity index 100% rename from borrowed/chartjs/samples/charts/radar.html rename to borrowed/chartjs-2/samples/charts/radar.html diff --git a/borrowed/chartjs/samples/charts/scatter/basic.html b/borrowed/chartjs-2/samples/charts/scatter/basic.html similarity index 100% rename from borrowed/chartjs/samples/charts/scatter/basic.html rename to borrowed/chartjs-2/samples/charts/scatter/basic.html diff --git a/borrowed/chartjs/samples/charts/scatter/multi-axis.html b/borrowed/chartjs-2/samples/charts/scatter/multi-axis.html similarity index 100% rename from borrowed/chartjs/samples/charts/scatter/multi-axis.html rename to borrowed/chartjs-2/samples/charts/scatter/multi-axis.html diff --git a/borrowed/chartjs/samples/favicon.ico b/borrowed/chartjs-2/samples/favicon.ico similarity index 100% rename from borrowed/chartjs/samples/favicon.ico rename to borrowed/chartjs-2/samples/favicon.ico diff --git a/borrowed/chartjs/samples/index.html b/borrowed/chartjs-2/samples/index.html similarity index 100% rename from borrowed/chartjs/samples/index.html rename to borrowed/chartjs-2/samples/index.html diff --git a/borrowed/chartjs/samples/legend/callbacks.html b/borrowed/chartjs-2/samples/legend/callbacks.html similarity index 100% rename from borrowed/chartjs/samples/legend/callbacks.html rename to borrowed/chartjs-2/samples/legend/callbacks.html diff --git a/borrowed/chartjs/samples/legend/point-style.html b/borrowed/chartjs-2/samples/legend/point-style.html similarity index 100% rename from borrowed/chartjs/samples/legend/point-style.html rename to borrowed/chartjs-2/samples/legend/point-style.html diff --git a/borrowed/chartjs/samples/legend/positioning.html b/borrowed/chartjs-2/samples/legend/positioning.html similarity index 100% rename from borrowed/chartjs/samples/legend/positioning.html rename to borrowed/chartjs-2/samples/legend/positioning.html diff --git a/borrowed/chartjs/samples/logo.svg b/borrowed/chartjs-2/samples/logo.svg similarity index 100% rename from borrowed/chartjs/samples/logo.svg rename to borrowed/chartjs-2/samples/logo.svg diff --git a/borrowed/chartjs/samples/samples.js b/borrowed/chartjs-2/samples/samples.js similarity index 100% rename from borrowed/chartjs/samples/samples.js rename to borrowed/chartjs-2/samples/samples.js diff --git a/borrowed/chartjs/samples/scales/filtering-labels.html b/borrowed/chartjs-2/samples/scales/filtering-labels.html similarity index 100% rename from borrowed/chartjs/samples/scales/filtering-labels.html rename to borrowed/chartjs-2/samples/scales/filtering-labels.html diff --git a/borrowed/chartjs/samples/scales/gridlines-display.html b/borrowed/chartjs-2/samples/scales/gridlines-display.html similarity index 100% rename from borrowed/chartjs/samples/scales/gridlines-display.html rename to borrowed/chartjs-2/samples/scales/gridlines-display.html diff --git a/borrowed/chartjs/samples/scales/gridlines-style.html b/borrowed/chartjs-2/samples/scales/gridlines-style.html similarity index 100% rename from borrowed/chartjs/samples/scales/gridlines-style.html rename to borrowed/chartjs-2/samples/scales/gridlines-style.html diff --git a/borrowed/chartjs/samples/scales/linear/min-max-suggested.html b/borrowed/chartjs-2/samples/scales/linear/min-max-suggested.html similarity index 100% rename from borrowed/chartjs/samples/scales/linear/min-max-suggested.html rename to borrowed/chartjs-2/samples/scales/linear/min-max-suggested.html diff --git a/borrowed/chartjs/samples/scales/linear/min-max.html b/borrowed/chartjs-2/samples/scales/linear/min-max.html similarity index 100% rename from borrowed/chartjs/samples/scales/linear/min-max.html rename to borrowed/chartjs-2/samples/scales/linear/min-max.html diff --git a/borrowed/chartjs/samples/scales/linear/step-size.html b/borrowed/chartjs-2/samples/scales/linear/step-size.html similarity index 100% rename from borrowed/chartjs/samples/scales/linear/step-size.html rename to borrowed/chartjs-2/samples/scales/linear/step-size.html diff --git a/borrowed/chartjs/samples/scales/logarithmic/line.html b/borrowed/chartjs-2/samples/scales/logarithmic/line.html similarity index 100% rename from borrowed/chartjs/samples/scales/logarithmic/line.html rename to borrowed/chartjs-2/samples/scales/logarithmic/line.html diff --git a/borrowed/chartjs/samples/scales/logarithmic/scatter.html b/borrowed/chartjs-2/samples/scales/logarithmic/scatter.html similarity index 100% rename from borrowed/chartjs/samples/scales/logarithmic/scatter.html rename to borrowed/chartjs-2/samples/scales/logarithmic/scatter.html diff --git a/borrowed/chartjs/samples/scales/multiline-labels.html b/borrowed/chartjs-2/samples/scales/multiline-labels.html similarity index 100% rename from borrowed/chartjs/samples/scales/multiline-labels.html rename to borrowed/chartjs-2/samples/scales/multiline-labels.html diff --git a/borrowed/chartjs/samples/scales/non-numeric-y.html b/borrowed/chartjs-2/samples/scales/non-numeric-y.html similarity index 100% rename from borrowed/chartjs/samples/scales/non-numeric-y.html rename to borrowed/chartjs-2/samples/scales/non-numeric-y.html diff --git a/borrowed/chartjs/samples/scales/time/combo.html b/borrowed/chartjs-2/samples/scales/time/combo.html similarity index 100% rename from borrowed/chartjs/samples/scales/time/combo.html rename to borrowed/chartjs-2/samples/scales/time/combo.html diff --git a/borrowed/chartjs/samples/scales/time/financial.html b/borrowed/chartjs-2/samples/scales/time/financial.html similarity index 100% rename from borrowed/chartjs/samples/scales/time/financial.html rename to borrowed/chartjs-2/samples/scales/time/financial.html diff --git a/borrowed/chartjs/samples/scales/time/line-point-data.html b/borrowed/chartjs-2/samples/scales/time/line-point-data.html similarity index 100% rename from borrowed/chartjs/samples/scales/time/line-point-data.html rename to borrowed/chartjs-2/samples/scales/time/line-point-data.html diff --git a/borrowed/chartjs/samples/scales/time/line.html b/borrowed/chartjs-2/samples/scales/time/line.html similarity index 100% rename from borrowed/chartjs/samples/scales/time/line.html rename to borrowed/chartjs-2/samples/scales/time/line.html diff --git a/borrowed/chartjs/samples/scales/toggle-scale-type.html b/borrowed/chartjs-2/samples/scales/toggle-scale-type.html similarity index 100% rename from borrowed/chartjs/samples/scales/toggle-scale-type.html rename to borrowed/chartjs-2/samples/scales/toggle-scale-type.html diff --git a/borrowed/chartjs/samples/scriptable/bar.html b/borrowed/chartjs-2/samples/scriptable/bar.html similarity index 100% rename from borrowed/chartjs/samples/scriptable/bar.html rename to borrowed/chartjs-2/samples/scriptable/bar.html diff --git a/borrowed/chartjs/samples/scriptable/bubble.html b/borrowed/chartjs-2/samples/scriptable/bubble.html similarity index 100% rename from borrowed/chartjs/samples/scriptable/bubble.html rename to borrowed/chartjs-2/samples/scriptable/bubble.html diff --git a/borrowed/chartjs/samples/scriptable/line.html b/borrowed/chartjs-2/samples/scriptable/line.html similarity index 100% rename from borrowed/chartjs/samples/scriptable/line.html rename to borrowed/chartjs-2/samples/scriptable/line.html diff --git a/borrowed/chartjs/samples/scriptable/pie.html b/borrowed/chartjs-2/samples/scriptable/pie.html similarity index 100% rename from borrowed/chartjs/samples/scriptable/pie.html rename to borrowed/chartjs-2/samples/scriptable/pie.html diff --git a/borrowed/chartjs/samples/scriptable/polar.html b/borrowed/chartjs-2/samples/scriptable/polar.html similarity index 100% rename from borrowed/chartjs/samples/scriptable/polar.html rename to borrowed/chartjs-2/samples/scriptable/polar.html diff --git a/borrowed/chartjs/samples/scriptable/radar.html b/borrowed/chartjs-2/samples/scriptable/radar.html similarity index 100% rename from borrowed/chartjs/samples/scriptable/radar.html rename to borrowed/chartjs-2/samples/scriptable/radar.html diff --git a/borrowed/chartjs/samples/style.css b/borrowed/chartjs-2/samples/style.css similarity index 100% rename from borrowed/chartjs/samples/style.css rename to borrowed/chartjs-2/samples/style.css diff --git a/borrowed/chartjs/samples/tooltips/border.html b/borrowed/chartjs-2/samples/tooltips/border.html similarity index 100% rename from borrowed/chartjs/samples/tooltips/border.html rename to borrowed/chartjs-2/samples/tooltips/border.html diff --git a/borrowed/chartjs/samples/tooltips/callbacks.html b/borrowed/chartjs-2/samples/tooltips/callbacks.html similarity index 100% rename from borrowed/chartjs/samples/tooltips/callbacks.html rename to borrowed/chartjs-2/samples/tooltips/callbacks.html diff --git a/borrowed/chartjs/samples/tooltips/custom-line.html b/borrowed/chartjs-2/samples/tooltips/custom-line.html similarity index 100% rename from borrowed/chartjs/samples/tooltips/custom-line.html rename to borrowed/chartjs-2/samples/tooltips/custom-line.html diff --git a/borrowed/chartjs/samples/tooltips/custom-pie.html b/borrowed/chartjs-2/samples/tooltips/custom-pie.html similarity index 100% rename from borrowed/chartjs/samples/tooltips/custom-pie.html rename to borrowed/chartjs-2/samples/tooltips/custom-pie.html diff --git a/borrowed/chartjs/samples/tooltips/custom-points.html b/borrowed/chartjs-2/samples/tooltips/custom-points.html similarity index 100% rename from borrowed/chartjs/samples/tooltips/custom-points.html rename to borrowed/chartjs-2/samples/tooltips/custom-points.html diff --git a/borrowed/chartjs/samples/tooltips/interactions.html b/borrowed/chartjs-2/samples/tooltips/interactions.html similarity index 100% rename from borrowed/chartjs/samples/tooltips/interactions.html rename to borrowed/chartjs-2/samples/tooltips/interactions.html diff --git a/borrowed/chartjs/samples/tooltips/positioning.html b/borrowed/chartjs-2/samples/tooltips/positioning.html similarity index 100% rename from borrowed/chartjs/samples/tooltips/positioning.html rename to borrowed/chartjs-2/samples/tooltips/positioning.html diff --git a/borrowed/chartjs/samples/utils.js b/borrowed/chartjs-2/samples/utils.js similarity index 100% rename from borrowed/chartjs/samples/utils.js rename to borrowed/chartjs-2/samples/utils.js diff --git a/borrowed/chartjs/CMakeLists.txt b/borrowed/chartjs/CMakeLists.txt deleted file mode 100644 index c6795e0bd8..0000000000 --- a/borrowed/chartjs/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ - -set(chartjs_DATA - Chart.bundle.min.js - Chart.bundle.js -) - -file(GLOB_RECURSE chartjs_NOINST_DATA - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - samples Chart*) - -list(REMOVE_ITEM chartjs_NOINST_DATA ${chartjs_DATA}) - -install (FILES ${chartjs_DATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/chartjs) - -set_dist_list(chartjs_DIST CMakeLists.txt ${chartjs_DATA} ${chartjs_NOINST_DATA}) diff --git a/gnucash/report/html-chart.scm b/gnucash/report/html-chart.scm index 081b076d5d..1fb1817c8b 100644 --- a/gnucash/report/html-chart.scm +++ b/gnucash/report/html-chart.scm @@ -460,7 +460,7 @@ document.getElementById(chartid).onclick = function(evt) { ;; clashing on multi-column reports (id (symbol->string (gensym "chart")))) - (push (gnc:html-js-include "chartjs/Chart.bundle.min.js")) + (push (gnc:html-js-include "chartjs-2/Chart.bundle.min.js")) ;; the following hidden h3 is used to query style and copy onto chartjs (push "

") diff --git a/gnucash/report/test/test-html-utilities-srfi64.scm b/gnucash/report/test/test-html-utilities-srfi64.scm index 4362864721..920d0678e1 100644 --- a/gnucash/report/test/test-html-utilities-srfi64.scm +++ b/gnucash/report/test/test-html-utilities-srfi64.scm @@ -25,7 +25,7 @@ (test-begin "test-html-includes") (test-equal "windows path into rfc3986 uri" - "file:///C:/Program%20Files%20%28x86%29/gnucash/share/gnucash/chartjs/Chart.bundle.min.js" - (make-uri "C:\\Program Files (x86)\\gnucash/share\\gnucash\\chartjs/Chart.bundle.min.js")) + "file:///C:/Program%20Files%20%28x86%29/gnucash/share/gnucash/chartjs-2/Chart.bundle.min.js" + (make-uri "C:\\Program Files (x86)\\gnucash/share\\gnucash\\chartjs-2/Chart.bundle.min.js")) (test-end "test-html-includes"))