fixes merge

mneunomne · Jan 1, 2024 · 6fd0ff8 · 6fd0ff8
1 parent e912577
commit 6fd0ff8
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git a/src/about.html b/src/about.html
@@ -55,7 +55,6 @@
 <script src="js/vapi.js"></script>
 <script src="js/vapi-common.js"></script>
 <script src="js/vapi-client.js"></script>
-<script src="js/vapi-client-extra.js"></script> <!-- Adn needs vAPI broadcastListener-->
 <script src="js/theme.js" type="module"></script>
 <script src="js/i18n.js" type="module"></script>
 <script src="js/dashboard-common.js" type="module"></script>

diff --git a/src/dashboard.html b/src/dashboard.html
@@ -83,7 +83,6 @@
 <script src="js/vapi.js"></script>
 <script src="js/vapi-common.js"></script>
 <script src="js/vapi-client.js"></script>
-<script src="js/vapi-client-extra.js"></script> <!-- Adn needs vAPI broadcastListener-->
 <script src="js/theme.js" type="module"></script>
 <script src="js/i18n.js" type="module"></script>
 <script src="js/dashboard.js" type="module"></script>

diff --git a/src/js/adn/core.js b/src/js/adn/core.js
@@ -26,7 +26,7 @@
 import µb from '../background.js';
 import staticFilteringReverseLookup from '../reverselookup.js';
 import staticNetFilteringEngine from '../static-net-filtering.js'
-import { broadcast, filteringBehaviorChanged, onBroadcast } from '../broadcast.js';
+import { broadcast } from '../broadcast.js';
 
 import dnt from './dnt.js'
 

diff --git a/src/js/adn/menu.js b/src/js/adn/menu.js
@@ -28,6 +28,7 @@ import { renderNotifications, ReloadTab, addNotification } from './notifications
 import { setCost, targetDomain, decodeEntities, isNonLatin, isCyrillic } from './adn-utils.js';
 import { dom } from '../dom.js';
 import uDom from './uDom.js';
+import { broadcast, onBroadcast } from '../broadcast.js';
 
 (function () {
 
@@ -54,7 +55,7 @@ import uDom from './uDom.js';
     }
   }, 10)
 
-  vAPI.broadcastListener.add(request => {
+  onBroadcast(request => {
 
     switch (request.what) {
 

diff --git a/src/js/adn/vault.js b/src/js/adn/vault.js
@@ -24,6 +24,7 @@
 import { i18n$ } from "../i18n.js";
 import uDom from './uDom.js';
 import { renderNotifications } from './notifications.js';
+import { broadcast, onBroadcast } from '../broadcast.js';
 
 import {
   byField,
@@ -79,7 +80,7 @@ var transitionTimeout = null
 let gAds, gAdSets, gMin, gMax, gSliderRight, gSliderLeft, settings;
 let lastAdDetectedTime, waitingAds = []; // stateful
 
-vAPI.broadcastListener.add(request => {
+onBroadcast(request => {
   //console.log("GOT BROADCAST", request);
   switch (request.what) {
     case 'adAttempt':

diff --git a/src/js/broadcast.js b/src/js/broadcast.js
@@ -31,7 +31,7 @@ let broadcastChannel;
 
 export function broadcast(message) {
     if ( broadcastChannel === undefined ) {
-        broadcastChannel = new self.BroadcastChannel('ADN'); // AdNauseam change (uBO -> ADN)
+        broadcastChannel = new self.BroadcastChannel('uBO'); // AdNauseam change (uBO -> ADN)
     }
     broadcastChannel.postMessage(message);
 }
@@ -54,7 +54,7 @@ export async function broadcastToAll(message) {
 /******************************************************************************/
 
 export function onBroadcast(listener) {
-    const bc = new self.BroadcastChannel('ADN'); // AdNauseam change (uBO -> ADN)
+    const bc = new self.BroadcastChannel('uBO'); // AdNauseam change (uBO -> ADN)
     bc.onmessage = ev => listener(ev.data || {});
     return bc;
 }

diff --git a/src/js/dashboard.js b/src/js/dashboard.js
@@ -23,6 +23,7 @@
 
 import { renderNotifications } from './adn/notifications.js'
 import { dom, qs$ } from './dom.js';
+import { onBroadcast } from './broadcast.js';
 
 /******************************************************************************/
 
@@ -114,7 +115,7 @@ if ( self.location.hash.slice(1) === 'no-dashboard.html' ) {
 }
 
 /// ADN notification to appear on dashboard
-vAPI.broadcastListener.add(request => {
+onBroadcast(request => {
     switch (request.what) {
         case 'notifications':
             renderNotifications(request.notifications, "dashboard");