Merge pull request #2746 from mneunomne/#2740

adjust to badge icon and clicked count on vault button

Author: mneunomne

src/css/menu.css

@@ -307,7 +307,7 @@ header{
   display: block;
   background: var(--adn-blue);
   height: 20px;
-  width: 25px;
+  padding: 0px 5px;
   position: absolute;
   right: 5px;
   top: -10px;

src/js/adn/core.js

@@ -2383,6 +2383,7 @@ const adnauseam = (function () {
     const allAds = adlist()
     const json = adsForUI(reqPageStore.rawURL);
     json.total = allAds.length;
+    json.clicked = allAds.filter(ad => ad.visitedTs).length;
 
     // if we have no page ads, use the most recent (6)
     // avoid sending data for too many ads in messaging

src/js/adn/menu.js

@@ -39,6 +39,10 @@ import { broadcast, onBroadcast } from '../broadcast.js';
   var updatedButtonState = '';
   var colorBlindMode = false
 
+  // store values for setCounter
+  var total = 0
+  var clicked = 0
+
   // on adnRefresh event, update initialButtonState to updatedButtonState
   window.addEventListener('adnRefresh', function (e) {
     initialButtonState = updatedButtonState;
@@ -56,7 +60,7 @@ import { broadcast, onBroadcast } from '../broadcast.js';
   }, 10)
 
   onBroadcast(request => {
-
+    
     switch (request.what) {
 
       case 'adAttempt':
@@ -95,6 +99,8 @@ import { broadcast, onBroadcast } from '../broadcast.js';
     page = json && json.pageUrl;
     settings = json && json.prefs;
     recent = json && json.recent
+    total = json && json.total
+    clicked = json && json.clicked
 
     console.log("[ADN] renderPage settings", settings)
 
@@ -114,7 +120,7 @@ import { broadcast, onBroadcast } from '../broadcast.js';
 
     if (typeof json !== 'undefined' && json !== null) {
       ads = json.data;
-      setCounts(ads, json.total, json.recent);
+      setCounts(ads, json.total, json.recent, json.clicked);
     } else {
       console.warn("[ADN] json null, cant make ad list")
     }
@@ -167,11 +173,12 @@ import { broadcast, onBroadcast } from '../broadcast.js';
     });
   }
 
-  const setCounts = function (ads, total, recent) {
-    const numVisits = recent ? 0 : (visitedCount(ads) || 0);
-    uDom('#vault-count').text(total || 0);
+  const setCounts = function (_ads, _total, _recent, _clicked) {
+    // console.log("[ADN] setCounts", ads, total, recent)
+    const numVisits = recent ? 0 : (visitedCount(_ads) || 0);
+    uDom('#vault-count').text(`${_clicked || 0} / ${_total || 0}`);
     uDom('#visited').text(i18n$("adnMenuAdsClicked").replace("{{number}}", numVisits || 0));
-    uDom('#found').text(i18n$("adnMenuAdsDetected").replace("{{count}}", (ads && !recent) ? ads.length : 0));
+    uDom('#found').text(i18n$("adnMenuAdsDetected").replace("{{count}}", (ads && !_recent) ? _ads.length : 0));
     setCost(numVisits);
     adjustStatCSS();
   }
@@ -212,6 +219,8 @@ import { broadcast, onBroadcast } from '../broadcast.js';
   const updateAd = function (ad) { // update class, title, counts
     // console.log(ad);
     if (verify(ad)) {
+      clicked += 1
+      setCounts(ads, total, recent, clicked);
 
       const $ad = updateAdClasses(ad);
 

src/js/tab.js

@@ -1109,15 +1109,16 @@ vAPI.tabs = new vAPI.Tabs();
 
         const pageStore = µb.pageStoreFromTabId(tabId);
         let pageDomain = pageStore ? domainFromHostname(pageStore.tabHostname) : null; // ADN;
+
+        count = adnauseam.currentCount(pageStore.rawURL); // ADN
 
         if ( pageStore !== null ) {
             state = pageStore.getNetFilteringSwitch() ? 1 : 0;
             isStrict = pageStore.getIsPageStrictBlocked() ? 1 : 0 // ADN
             if ( state === 1 ) {
                 if ( (parts & 0b0010) !== 0 ) {
-                    const blockCount = pageStore.counts.blocked.any;
-                    if ( blockCount !== 0 ) {
-                        badge = µb.formatCount(blockCount);
+                    if ( count !== 0 ) {
+                        badge = µb.formatCount(count);
                     }
                 }
                 if ( (parts & 0b0100) !== 0 ) {
@@ -1128,12 +1129,11 @@ vAPI.tabs = new vAPI.Tabs();
             }
 
           state = adnauseam.getIconState(state, pageDomain, isClick, isStrict); // ADN
-          count = adnauseam.currentCount(pageStore.rawURL); // ADN
           badge = µb.formatCount(count);
         }
 
         // https://www.reddit.com/r/uBlockOrigin/comments/d33d37/
-        if ( µb.userSettings.showIconBadge === false ) {
+        if ( µb.userSettings.showIconBadge === false || count === 0 ) {
             parts |= 0b1000;
         }
 

src/menu.html

@@ -27,7 +27,7 @@ <h1>
         </h1>
         <div id="stats">
           <div class="wrapper">
-            <span id="visited" data-i18n="adnMenuAdsClicked">&nbsp;</span>
+            <span id="visited" data-i18n="adnMenuAdsClicked" alt="Total Ads Clicked / Collected by AdNauseam">&nbsp;</span>
             /
             <span id="found" data-i18n="adnMenuAdsDetected">&nbsp;</span>
             <span id="worth-estimate" class="cost highlighted"></span><a