Index: openacs-4/packages/highcharts/tcl/resource-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/highcharts/tcl/resource-procs.tcl,v diff -u -N -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/highcharts/tcl/resource-procs.tcl 23 Oct 2022 18:41:18 -0000 1.1.2.1 +++ openacs-4/packages/highcharts/tcl/resource-procs.tcl 24 Oct 2022 08:54:39 -0000 1.1.2.2 @@ -7,7 +7,6 @@ ::highcharts::resource_info ::highcharts::download - @author Gustaf Neumann @creation-date 23 Oct 2022 } @@ -50,7 +49,7 @@ set resourceUrl /resources/highcharts/$version set cdnHost cdnjs.cloudflare.com set cdn //$cdnHost/ - + if {[file exists $resourceDir/$version]} { # # Local version is installed @@ -70,11 +69,9 @@ # https://cdnjs.cloudflare.com/ajax/libs/highcharts/10.2.1/modules/exporting.js # https://cdnjs.cloudflare.com/ajax/libs/highcharts/10.2.1/modules/exporting.min.js # - # We just need the CSS file, which is on the CDN in the - # "font" directory. set prefix ${cdn}ajax/libs/highcharts/$version set cspMap [subst { - urn:ad:css:highcharts { + urn:ad:js:highcharts { script-src $cdnHost }}] # @@ -172,14 +169,16 @@ dict set urns urn:ad:js:highcharts $prefix/highcharts.min.js dict set urns urn:ad:js:highcharts-more $prefix/highcharts-more.min.js dict set urns urn:ad:js:highcharts/modules/exporting $prefix/modules/exporting.min.js - + dict set urns urn:ad:js:highcharts/modules/accessibility $prefix/modules/accessibility.min.js + } else { # # Settings for local installs # dict set urns urn:ad:js:highcharts $prefix/highcharts.js dict set urns urn:ad:js:highcharts-more $prefix/highcharts-more.js dict set urns urn:ad:js:highcharts/modules/exporting $prefix/modules/exporting.js + dict set urns urn:ad:js:highcharts/modules/accessibility $prefix/modules/accessibility.js } foreach {URN resource} $urns { @@ -189,7 +188,7 @@ -csp_list [expr {[dict exists $resource_info cspMap $URN] ? [dict get $resource_info cspMap $URN] : ""}] - } + } } }