Update count.js

Author: DJRahimAli

count.js

@@ -1,13 +1,9 @@
 // GoatCounter: https://www.goatcounter.com
-// This file (and *only* this file) is released under the ISC license:
-// https://opensource.org/licenses/ISC
+// This file is released under the ISC license: https://opensource.org/licenses/ISC
 ;(function() {
 	'use strict';
 
-	if (window.goatcounter && window.goatcounter.vars)  // Compatibility with very old version; do not use.
-		window.goatcounter = window.goatcounter.vars
-	else
-		window.goatcounter = window.goatcounter || {}
+	window.goatcounter = window.goatcounter || {}
 
 	// Load settings from data-goatcounter-settings.
 	var s = document.querySelector('script[data-goatcounter]')
@@ -22,13 +18,14 @@
 	var enc = encodeURIComponent
 
 	// Get all data we're going to send off to the counter endpoint.
-	var get_data = function(vars) {
+	window.goatcounter.get_data = function(vars) {
+		vars = vars || {}
 		var data = {
 			p: (vars.path     === undefined ? goatcounter.path     : vars.path),
 			r: (vars.referrer === undefined ? goatcounter.referrer : vars.referrer),
 			t: (vars.title    === undefined ? goatcounter.title    : vars.title),
 			e: !!(vars.event || goatcounter.event),
-			s: [window.screen.width, window.screen.height, (window.devicePixelRatio || 1)],
+			s: window.screen.width,
 			b: is_bot(),
 			q: location.search,
 		}
@@ -85,9 +82,7 @@
 	// Get the endpoint to send requests to.
 	var get_endpoint = function() {
 		var s = document.querySelector('script[data-goatcounter]')
-		if (s && s.dataset.goatcounter)
-			return s.dataset.goatcounter
-		return (goatcounter.endpoint || window.counter)  // counter is for compat; don't use.
+		return (s && s.dataset.goatcounter) ? s.dataset.goatcounter : goatcounter.endpoint
 	}
 
 	// Get current path.
@@ -112,7 +107,7 @@
 	}
 
 	// Filter some requests that we (probably) don't want to count.
-	goatcounter.filter = function() {
+	window.goatcounter.filter = function() {
 		if ('visibilityState' in document && document.visibilityState === 'prerender')
 			return 'visibilityState'
 		if (!goatcounter.allow_frame && location !== parent.location)
@@ -128,7 +123,7 @@
 
 	// Get URL to send to GoatCounter.
 	window.goatcounter.url = function(vars) {
-		var data = get_data(vars || {})
+		var data = window.goatcounter.get_data(vars || {})
 		if (data.p === null)  // null from user callback.
 			return
 		data.rnd = Math.random().toString(36).substr(2, 5)  // Browsers don't always listen to Cache-Control.
@@ -145,14 +140,13 @@
 		var f = goatcounter.filter()
 		if (f)
 			return warn('not counting because of: ' + f)
-
 		var url = goatcounter.url(vars)
 		if (!url)
 			return warn('not counting because path callback returned null')
 
-		if (navigator.sendBeacon)
-			navigator.sendBeacon(url)
-		else {  // Fallback for (very) old browsers.
+		if (!navigator.sendBeacon(url)) {
+			// This mostly fails due to being blocked by CSP; try again with an
+			// image-based fallback.
 			var img = document.createElement('img')
 			img.src = url
 			img.style.position = 'absolute'  // Affect layout less.
@@ -233,7 +227,7 @@
 
 			var p = document.querySelector(opt.append)
 			if (!p)
-				return warn('visit_count: append not found: ' + opt.append)
+				return warn('visit_count: element to append to not found: ' + opt.append)
 			p.appendChild(d)
 		})
 	}
@@ -270,4 +264,4 @@
 			if (!goatcounter.no_events)
 				goatcounter.bind_events()
 		})
-})();
+})();