Upgraded to D3.js v7 including charts.js code.

derkaan · May 27, 2023 · b7f8790 · b7f8790
1 parent 07fd62f
commit b7f8790
Show file tree

Hide file tree

Showing 6 changed files with 304 additions and 234 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -9,7 +9,7 @@ dist_noinst_DATA =                 \
   resources/css/fa.min.css         \
   resources/js/app.js              \
   resources/js/charts.js           \
-  resources/js/d3.v3.min.js        \
+  resources/js/d3.v7.min.js        \
   resources/js/hogan.min.js
 
 noinst_PROGRAMS = bin2c
@@ -38,7 +38,7 @@ CLEANFILES =                          \
   resources/css/bootstrap.min.css.tmp \
   resources/css/fa.min.css.tmp        \
   resources/css/app.css.tmp           \
-  resources/js/d3.v3.min.js.tmp       \
+  resources/js/d3.v7.min.js.tmp       \
   resources/js/hogan.min.js.tmp       \
   resources/js/charts.js.tmp          \
   resources/js/app.js.tmp
@@ -76,12 +76,12 @@ else
 	./bin2c $(srcdir)/resources/css/app.css src/appcss.h app_css
 endif
 # D3.js
-src/d3js.h: bin2c$(EXEEXT) $(srcdir)/resources/js/d3.v3.min.js
+src/d3js.h: bin2c$(EXEEXT) $(srcdir)/resources/js/d3.v7.min.js
 if HAS_SEDTR
-	cat $(srcdir)/resources/js/d3.v3.min.js | sed "s/^[[:space:]]*//" | sed "/^$$/d" | tr -d "\r\n" > $(srcdir)/resources/js/d3.v3.min.js.tmp
-	./bin2c $(srcdir)/resources/js/d3.v3.min.js.tmp src/d3js.h d3_js
+	cat $(srcdir)/resources/js/d3.v7.min.js | sed "s/^[[:space:]]*//" | sed "/^$$/d" | tr -d "\r\n" > $(srcdir)/resources/js/d3.v7.min.js.tmp
+	./bin2c $(srcdir)/resources/js/d3.v7.min.js.tmp src/d3js.h d3_js
 else
-	./bin2c $(srcdir)/resources/js/d3.v3.min.js src/d3js.h d3_js
+	./bin2c $(srcdir)/resources/js/d3.v7.min.js src/d3js.h d3_js
 endif
 # Hogan.js
 src/hoganjs.h: bin2c$(EXEEXT) $(srcdir)/resources/js/hogan.min.js

diff --git a/resources/css/app.css b/resources/css/app.css
@@ -592,6 +592,7 @@ line.indicator {
 	shape-rendering: crispEdges;
 	stroke: #999;
 	stroke-width: 1;
+	display: none;
 }
 .area0,
 .bars.y0 .bar,

diff --git a/resources/js/app.js b/resources/js/app.js
@@ -1249,7 +1249,8 @@ GoAccess.Charts = {
 
 		d3.select("#chart-" + panel)
 			.datum(this.processChartData(this.getPanelData(panel, data)))
-			.call(chart.width($("#chart-" + panel).offsetWidth));
+			.call(chart.width($("#chart-" + panel).offsetWidth))
+			.append("div").attr("class", "chart-tooltip-wrap");
 	},
 
 	// Reload (doesn't redraw) all chart's data