Merge pull request #42 from iMattPro/fixes

Service Worker Updater Fixes
phpbb-extensions · May 28, 2024 · 08c7348 · 08c7348
2 parents 301ff6b + e9e96a8
commit 08c7348
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/styles/all/template/update_worker.js b/styles/all/template/update_worker.js
@@ -13,14 +13,15 @@ function webpushWorkerUpdate() {
 	}
 }
 // Do not redeclare function if exist
+/* global domReady */
 if (typeof domReady === 'undefined') {
 	window.domReady = function(callBack) {
 		if (document.readyState === 'loading') {
 			document.addEventListener('DOMContentLoaded', callBack);
 		} else {
 			callBack();
 		}
-	}
+	};
 }
 
 domReady(() => {

diff --git a/styles/prosilver/template/event/overall_footer_after.html b/styles/prosilver/template/event/overall_footer_after.html
@@ -1,4 +1,6 @@
-<script>
-	const serviceWorkerUrl = '{{ U_WEBPUSH_WORKER_URL }}';
-</script>
-{% INCLUDEJS('@phpbb_webpushnotifications/update_worker.js') %}
+{% if U_WEBPUSH_WORKER_URL %}
+	<script>
+		const serviceWorkerUrl = '{{ U_WEBPUSH_WORKER_URL }}';
+	</script>
+	{% INCLUDEJS '@phpbb_webpushnotifications/update_worker.js' %}
+{% endif %}
diff --git a/styles/prosilver/template/ucp_notifications_webpush.html b/styles/prosilver/template/ucp_notifications_webpush.html
@@ -17,5 +17,5 @@
 	}
 </script>
 
-{% INCLUDEJS('@phpbb_webpushnotifications/webpush.js') %}
-{% INCLUDECSS('@phpbb_webpushnotifications/phpbb_wpn.css') %}
+{% INCLUDEJS '@phpbb_webpushnotifications/webpush.js' %}
+{% INCLUDECSS '@phpbb_webpushnotifications/phpbb_wpn.css' %}