Merge 9bd1631103 into 2244f3f528

Export: Cleanup jqplot Module References.
Clean up references to the jqplot modules that were overlooked in #4350. Signed-off-by: Michael Keller <mikeller@042.ch>
2024-11-30 22:20:21 +00:00 · 2024-10-22 12:08:21 +13:00 · 2024-10-22 10:23:29 +13:00
4 changed files with 12 additions and 11 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1,8 +1,9 @@
 .gitignore	export-ignore
 .gitattributes	export-ignore
 Documentation/*.html.git text=auto
-theme/jqplot.canvasAxisTickRenderer.min.js binary
-theme/jqplot.highlighter.min.js binary
+theme/jqplot.canvasAxisTickRenderer.js binary
+theme/jqplot.canvasTextRenderer.js binary
+theme/jqplot.highlighter.js binary
 theme/jquery.jqplot.min.js binary
 theme/jquery.min.js binary
 CHANGELOG.md -text merge=union
--- a/core/divelogexportlogic.cpp
+++ b/core/divelogexportlogic.cpp
@ -155,10 +155,10 @@ void exportHtmlInitLogic(const QString &filename, struct htmlExportSetting &hes)
 	file_copy_and_overwrite(searchPath + "dive_export.html", filename);
 	file_copy_and_overwrite(searchPath + "list_lib.js", exportFiles + "list_lib.js");
 	file_copy_and_overwrite(searchPath + "poster.png", exportFiles + "poster.png");
-	file_copy_and_overwrite(searchPath + "jqplot.highlighter.min.js", exportFiles + "jqplot.highlighter.min.js");
 	file_copy_and_overwrite(searchPath + "jquery.jqplot.min.js", exportFiles + "jquery.jqplot.min.js");
-	file_copy_and_overwrite(searchPath + "jqplot.canvasAxisTickRenderer.min.js", exportFiles + "jqplot.canvasAxisTickRenderer.min.js");
-	file_copy_and_overwrite(searchPath + "jqplot.canvasTextRenderer.min.js", exportFiles + "jqplot.canvasTextRenderer.min.js");
+	file_copy_and_overwrite(searchPath + "jqplot.canvasAxisTickRenderer.js", exportFiles + "jqplot.canvasAxisTickRenderer.js");
+	file_copy_and_overwrite(searchPath + "jqplot.canvasTextRenderer.js", exportFiles + "jqplot.canvasTextRenderer.js");
+	file_copy_and_overwrite(searchPath + "jqplot.highlighter.js", exportFiles + "jqplot.highlighter.js");
 	file_copy_and_overwrite(searchPath + "jquery.min.js", exportFiles + "jquery.min.js");
 	file_copy_and_overwrite(searchPath + "jquery.jqplot.min.css", exportFiles + "jquery.jqplot.min.css");
 	file_copy_and_overwrite(searchPath + hes.themeFile, exportFiles + "theme.css");
--- a/packaging/ubuntu/debian/source.lintian-overrides
+++ b/packaging/ubuntu/debian/source.lintian-overrides
@ -1,7 +1,7 @@
 # We use the package
-subsurface source: source-is-missing theme/jqplot.canvasAxisTickRenderer.min.js
-subsurface source: source-is-missing theme/jqplot.canvasTextRenderer.min.js
-subsurface source: source-is-missing theme/jqplot.highlighter.min.js
+subsurface source: source-is-missing theme/jqplot.canvasAxisTickRenderer.js
+subsurface source: source-is-missing theme/jqplot.canvasTextRenderer.js
+subsurface source: source-is-missing theme/jqplot.highlighter.js
 subsurface source: source-is-missing theme/jquery.jqplot.min.js
 subsurface source: source-is-missing theme/jquery.min.js
 subsurface source: source-is-missing theme/list_lib.js
--- a/theme/dive_export.html
+++ b/theme/dive_export.html
@ -49,9 +49,9 @@ function load_scripts()
 	load_script_sync("list_lib.js");
 	load_script_sync("jquery.min.js");
 	load_script_sync("jquery.jqplot.min.js");
-	load_script_sync("jqplot.highlighter.min.js");
-	load_script_sync("jqplot.canvasAxisTickRenderer.min.js");
-	load_script_sync("jqplot.canvasTextRenderer.min.js");
+	load_script_sync("jqplot.canvasAxisTickRenderer.js");
+	load_script_sync("jqplot.canvasTextRenderer.js");
+	load_script_sync("jqplot.highlighter.js");
 }

 var advanced_shown=false;
Author	SHA1	Message	Date
Egbert de Pauw	a149434511	Merge `9bd1631103` into `2244f3f528`	2024-10-22 12:08:21 +13:00
Michael Keller	2244f3f528	Export: Cleanup jqplot Module References. Clean up references to the jqplot modules that were overlooked in #4350. Signed-off-by: Michael Keller <mikeller@042.ch>	2024-10-22 10:23:29 +13:00