This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new b2fdc8c2fe Fixed: Example charts don't work (OFBIZ-13149)
b2fdc8c2fe is described below
commit b2fdc8c2fecd075bf333561e63e7e63184f90c2a
Author: Jacques Le Roux <[email protected]>
AuthorDate: Wed Oct 16 16:25:22 2024 +0200
Fixed: Example charts don't work (OFBIZ-13149)
As I don't want to dive into complication and that works, simply reverts
changes
in both Bars.ftl and Pie.ftl from jquery.flot.min.js to jquery.flot.js
to fix the issues. We can certainly do better, if you feel so, please do...
That was part of commit b063216cde4139f88d66f83a5785cd465c9a4183:
Improved: Use NPM with gradle to get external JS dependencies (OFBIZ-11960)
Puts the Uglify script in package.json with an example of use for
jquery.flot.js
The size diff between jquery.flot.js and jquery.flot.min.js is only 2%, so
it's
more an example...
Note: to run the Uglify task alone use "gradlew npm_run_uglify"
---
themes/common-theme/template/includes/flotCharts/Bars.ftl | 2 +-
themes/common-theme/template/includes/flotCharts/Pie.ftl | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/themes/common-theme/template/includes/flotCharts/Bars.ftl
b/themes/common-theme/template/includes/flotCharts/Bars.ftl
index c24b0888b2..5aec338200 100644
--- a/themes/common-theme/template/includes/flotCharts/Bars.ftl
+++ b/themes/common-theme/template/includes/flotCharts/Bars.ftl
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript"
src="<@ofbizContentUrl>/common/js/node_modules/flot/dist/es5/jquery.flot.min.js</@ofbizContentUrl>"></script>
+<script type="application/javascript"
src="<@ofbizContentUrl>/common/js/node_modules/flot/dist/es5/jquery.flot.js</@ofbizContentUrl>"></script>
<div id="${chartId}Div" style="width:600px;height:300px;"></div>
diff --git a/themes/common-theme/template/includes/flotCharts/Pie.ftl
b/themes/common-theme/template/includes/flotCharts/Pie.ftl
index 19cb4bec41..39bd639606 100644
--- a/themes/common-theme/template/includes/flotCharts/Pie.ftl
+++ b/themes/common-theme/template/includes/flotCharts/Pie.ftl
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<script type="application/javascript"
src="<@ofbizContentUrl>/common/js/node_modules/flot/dist/es5/jquery.flot.min.js</@ofbizContentUrl>"></script>
+<script type="application/javascript"
src="<@ofbizContentUrl>/common/js/node_modules/flot/dist/es5/jquery.flot.js</@ofbizContentUrl>"></script>
<script type="application/javascript"
src="<@ofbizContentUrl>/common/js/node_modules/flot/source/jquery.flot.pie.js</@ofbizContentUrl>"></script>
