nodebb-plugin-ezoic-infinite 1.6.32 → 1.6.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "1.6.32",
+  "version": "1.6.33",
   "description": "Production-ready Ezoic infinite ads integration for NodeBB 4.x",
   "main": "library.js",
   "license": "MIT",

package/public/client.js

@@ -1514,76 +1514,101 @@ function buildOrdinalMap(items) {
 
 
 
-// ===== V17.4: Hide top pile (supports ul>div OR li hosts), no moving, keeps injection intact =====
+// ===== V17.5: Viewport-based pile masking (no moves, keeps injection intact) =====
 (function(){
   var TOPIC_LI_SEL = 'li[component="category/topic"]';
   var BETWEEN_WRAP_SEL = 'div.nodebb-ezoic-wrap.ezoic-ad-between';
   var HOST_CLASS = 'nodebb-ezoic-host';
   var PILED_ATTR = 'data-ezoic-piled';
 
-  var lastY = window.pageYOffset || document.documentElement.scrollTop || 0;
   var scheduled = false;
   var lastRun = 0;
-  var COOLDOWN = 90;
+  var COOLDOWN = 70;
+
+  var lastY = window.pageYOffset || document.documentElement.scrollTop || 0;
 
   function getY(){ return window.pageYOffset || document.documentElement.scrollTop || 0; }
 
   function getTopicList(){
-    try {
+    try{
       var li = document.querySelector(TOPIC_LI_SEL);
       if (!li) return null;
       return li.closest ? li.closest('ul,ol') : null;
-    } catch(e){ return null; }
+    }catch(e){ return null; }
   }
 
   function isBetweenNode(el){
-    try {
-      if (!el || el.nodeType !== 1) return false;
-      if (el.matches && el.matches(BETWEEN_WRAP_SEL)) return true; // ul>div case
-      if (el.tagName === 'LI' && el.classList && el.classList.contains(HOST_CLASS)) {
+    try{
+      if (!el || el.nodeType!==1) return false;
+      if (el.matches && el.matches(BETWEEN_WRAP_SEL)) return true; // ul>div
+      if (el.tagName==='LI' && el.classList && el.classList.contains(HOST_CLASS)) {
         return !!(el.querySelector && el.querySelector(BETWEEN_WRAP_SEL));
       }
-    } catch(e){}
+    }catch(e){}
     return false;
   }
 
   function isTopicNode(el){
-    try { return !!(el && el.nodeType===1 && el.matches && el.matches(TOPIC_LI_SEL)); } catch(e){ return false; }
+    try{ return !!(el && el.nodeType===1 && el.matches && el.matches(TOPIC_LI_SEL)); }catch(e){ return false; }
   }
 
-  function clearPiled(ul){
-    try {
+  function setPiled(el, piled){
+    try{
+      if (!el) return;
+      if (piled) el.setAttribute(PILED_ATTR,'1');
+      else el.removeAttribute(PILED_ATTR);
+    }catch(e){}
+  }
+
+  function clearAll(ul){
+    try{
       if (!ul) return;
-      ul.querySelectorAll('['+PILED_ATTR+'="1"]').forEach(function(n){
-        try { n.removeAttribute(PILED_ATTR); } catch(e){}
-      });
-    } catch(e){}
+      ul.querySelectorAll('['+PILED_ATTR+'="1"]').forEach(function(n){ setPiled(n,false); });
+    }catch(e){}
   }
 
-  function markTopPile(ul){
-    // Mark any consecutive between nodes near top (keep the first, hide the rest until next topic).
-    try {
+  function maskViewportPile(ul){
+    // We mask piled ads based on what is actually near/in the viewport, not just first N children.
+    // This catches cases where virtualization moves some ads but not others.
+    try{
       if (!ul) return;
+      var vh = window.innerHeight || 800;
+      var bandTop = -200;                // slightly above viewport
+      var bandBottom = vh * 1.6;         // covers top area user sees when returning up
+
+      // collect candidates in band in DOM order
       var kids = ul.children;
-      var limit = Math.min(kids.length, 140);
-      var inRun = 0;
-      for (var i=0;i<limit;i++){
+      var candidates = [];
+      for (var i=0;i<kids.length;i++){
         var el = kids[i];
-        if (isBetweenNode(el)){
-          inRun++;
-          if (inRun >= 2){
-            try { el.setAttribute(PILED_ATTR,'1'); } catch(e){}
-          } else {
-            try { el.removeAttribute(PILED_ATTR); } catch(e){}
-          }
-        } else if (isTopicNode(el)){
-          inRun = 0;
-        } else {
-          // other node breaks run as well
-          inRun = 0;
+        if (!isBetweenNode(el) && !isTopicNode(el)) continue;
+        // compute rect (cheap enough on limited band; stop after we've passed far below band)
+        var r = el.getBoundingClientRect ? el.getBoundingClientRect() : null;
+        if (!r) continue;
+        if (r.top > bandBottom && candidates.length > 0) {
+          // Once we've started collecting and we are past band, we can stop scanning further.
+          break;
         }
+        if (r.bottom < bandTop) continue;
+        if (r.top > bandBottom) continue;
+
+        candidates.push(el);
       }
-    } catch(e){}
+
+      // Now walk candidates and hide consecutive between nodes (keep first between in a run)
+      var run = 0;
+      for (var j=0;j<candidates.length;j++){
+        var el2 = candidates[j];
+        if (isTopicNode(el2)){
+          run = 0;
+          continue;
+        }
+        if (isBetweenNode(el2)){
+          run++;
+          setPiled(el2, run >= 2);
+        }
+      }
+    }catch(e){}
   }
 
   function schedule(fn){
@@ -1606,38 +1631,45 @@ function buildOrdinalMap(items) {
     var ul = getTopicList();
     if (!ul) return;
 
-    // Only manage pile visibility when user is near the top area.
-    if (y < 1100 && dy < -6){
-      schedule(function(){ markTopPile(ul); });
-    } else if (y > 1300 || dy > 10){
-      // leaving top area or scrolling down: restore visibility
-      schedule(function(){ clearPiled(ul); });
+    // Only manage pile masking when user is heading upward OR is near top-ish.
+    if (dy < -6 || y < 1100){
+      schedule(function(){ maskViewportPile(ul); });
+    } else if (dy > 12 && y > 1400){
+      // when leaving the top area, restore visibility
+      schedule(function(){ clearAll(ul); });
     }
   }
 
   function init(){
     window.addEventListener('scroll', onScroll, { passive:true });
+    window.addEventListener('resize', function(){
+      var ul = getTopicList();
+      if (!ul) return;
+      schedule(function(){ maskViewportPile(ul); });
+    }, { passive:true });
 
     if (window.jQuery){
       try{
         window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function(){
-          // if we are near top, re-evaluate pile quickly; otherwise ensure no stale hiding
           setTimeout(function(){
-            try {
-              var ul = getTopicList();
-              if (!ul) return;
-              var y = getY();
-              if (y < 1100) markTopPile(ul);
-              else clearPiled(ul);
-            } catch(e){}
-          }, 80);
+            var ul = getTopicList();
+            if (!ul) return;
+            schedule(function(){ maskViewportPile(ul); });
+          }, 120);
         });
       }catch(e){}
     }
+
+    // initial
+    setTimeout(function(){
+      var ul = getTopicList();
+      if (!ul) return;
+      schedule(function(){ maskViewportPile(ul); });
+    }, 250);
   }
 
   if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', init);
   else init();
 })();
-// ===== /V17.4 =====
+// ===== /V17.5 =====
 

package/public/style.css

@@ -88,10 +88,10 @@ li.nodebb-ezoic-host > .nodebb-ezoic-wrap.ezoic-ad-between { width: 100%; displa
 
 
 
-/* ===== V17.4 pile hide ===== */
+/* ===== V17.5 pile hide ===== */
 [data-ezoic-piled="1"] { display: none !important; }
 /* keep host stable */
 li.nodebb-ezoic-host { list-style:none; width:100%; display:block; }
 li.nodebb-ezoic-host > .nodebb-ezoic-wrap.ezoic-ad-between { width:100%; display:block; }
-/* ===== /V17.4 ===== */
+/* ===== /V17.5 ===== */