nodebb-plugin-ezoic-infinite 1.6.31 → 1.6.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "1.6.31",
+  "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,134 +1514,100 @@ function buildOrdinalMap(items) {
 
 
 
-// ===== V17.3: keep injection; hide top pile on upscroll; rehome EMPTY hosts on downscroll =====
+// ===== 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 = 120;
+  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 ensureHostForWrap(wrap, ul){
+  function isBetweenNode(el){
     try{
-      if (!wrap || wrap.nodeType!==1) return null;
-      if (!(wrap.matches && wrap.matches(BETWEEN_WRAP_SEL))) return null;
-
-      var host = wrap.closest ? wrap.closest('li.'+HOST_CLASS) : null;
-      if (host) return host;
-
-      if (!ul) ul = wrap.closest ? wrap.closest('ul,ol') : null;
-      if (!ul || !(ul.tagName==='UL' || ul.tagName==='OL')) return null;
-
-      if (wrap.parentElement === ul){
-        host = document.createElement('li');
-        host.className = HOST_CLASS;
-        host.setAttribute('role','listitem');
-        host.style.listStyle='none';
-        host.style.width='100%';
-        // preserve after
-        try {
-          var after = wrap.getAttribute('data-ezoic-after');
-          if (after) host.setAttribute('data-ezoic-after', after);
-        } catch(e){}
-        ul.insertBefore(host, wrap);
-        host.appendChild(wrap);
-        try { wrap.style.width='100%'; } catch(e){}
-        return host;
+      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){}
-    return null;
+    return false;
   }
 
-  function hostHasAdContent(host){
-    // iframes/amp ads mean it's already rendered; moving might reduce fill
-    try{
-      return !!(host.querySelector && host.querySelector('iframe, amp-ad, amp-iframe, .amp-ads, .ezoic-ad iframe'));
-    }catch(e){ return false; }
+  function isTopicNode(el){
+    try{ return !!(el && el.nodeType===1 && el.matches && el.matches(TOPIC_LI_SEL)); }catch(e){ return false; }
   }
 
-  function nthTopic(ul, n){
+  function setPiled(el, piled){
     try{
-      var topics = ul.querySelectorAll(TOPIC_LI_SEL);
-      if (!topics || !topics.length) return null;
-      if (n<1) n=1;
-      if (n>topics.length) n=topics.length;
-      return topics[n-1] || null;
-    }catch(e){ return null; }
+      if (!el) return;
+      if (piled) el.setAttribute(PILED_ATTR,'1');
+      else el.removeAttribute(PILED_ATTR);
+    }catch(e){}
   }
 
-  function getAfter(host){
+  function clearAll(ul){
     try{
-      var v = host.getAttribute('data-ezoic-after');
-      if (!v){
-        var wrap = host.querySelector && host.querySelector(BETWEEN_WRAP_SEL);
-        if (wrap) v = wrap.getAttribute('data-ezoic-after');
-      }
-      var n = parseInt(v,10);
-      return isNaN(n)? null : n;
-    }catch(e){ return null; }
+      if (!ul) return;
+      ul.querySelectorAll('['+PILED_ATTR+'="1"]').forEach(function(n){ setPiled(n,false); });
+    }catch(e){}
   }
 
-  function detectAndHideTopPile(ul){
-    // Hide piled hosts near top so user doesn't see the stack.
+  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, 60);
-      var run = 0;
-      for (var i=0;i<limit;i++){
+      var candidates = [];
+      for (var i=0;i<kids.length;i++){
         var el = kids[i];
-        var isBetweenHost = (el.tagName==='LI' && el.classList && el.classList.contains(HOST_CLASS) && el.querySelector && el.querySelector(BETWEEN_WRAP_SEL));
-        var isTopic = (el.matches && el.matches(TOPIC_LI_SEL));
-        if (isBetweenHost){
-          run++;
-          if (run>=2){
-            // mark piled beyond the first
-            el.setAttribute(PILED_ATTR,'1');
-          }
-        } else if (isTopic){
-          run=0;
-        } else {
-          // reset on any non-topic
+        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){}
-  }
 
-  function rehomePiledEmptyOnDownscroll(ul){
-    // On downscroll, try to move only EMPTY (not yet rendered) piled hosts to intended anchors and unhide them.
-    try{
-      var piled = ul.querySelectorAll('li.'+HOST_CLASS+'['+PILED_ATTR+'="1"]');
-      if (!piled.length) return;
-
-      piled.forEach(function(host){
-        try{
-          // if it already has rendered ad, just unhide; do not move
-          if (hostHasAdContent(host)){
-            host.removeAttribute(PILED_ATTR);
-            return;
-          }
-          var after = getAfter(host);
-          var anchor = after!=null ? nthTopic(ul, after) : null;
-          if (anchor){
-            anchor.insertAdjacentElement('afterend', host);
-          }
-          host.removeAttribute(PILED_ATTR);
-        }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){}
   }
 
@@ -1651,7 +1617,7 @@ function buildOrdinalMap(items) {
     if (scheduled) return;
     scheduled = true;
     requestAnimationFrame(function(){
-      scheduled=false;
+      scheduled = false;
       lastRun = Date.now();
       fn();
     });
@@ -1661,42 +1627,49 @@ function buildOrdinalMap(items) {
     var y = getY();
     var dy = y - lastY;
     lastY = y;
+
     var ul = getTopicList();
     if (!ul) return;
 
-    // always wrap invalid ul>div (cheap)
-    try { ul.querySelectorAll(':scope > '+BETWEEN_WRAP_SEL).forEach(function(w){ ensureHostForWrap(w, ul); }); } catch(e){}
-
-    if (dy < -8 && y < 900){
-      // upscroll near top: hide pile quickly (no moving)
-      schedule(function(){ detectAndHideTopPile(ul); });
-    } else if (dy > 8){
-      // downscroll: rehome only empty piled hosts (safe) and unhide
-      schedule(function(){ rehomePiledEmptyOnDownscroll(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(){
-          // wrap invalids only
           setTimeout(function(){
-            try{
-              var ul = getTopicList();
-              if (!ul) return;
-              ul.querySelectorAll(':scope > '+BETWEEN_WRAP_SEL).forEach(function(w){ ensureHostForWrap(w, ul); });
-            }catch(e){}
-          }, 50);
+            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.3 =====
+// ===== /V17.5 =====
 

package/public/style.css

@@ -88,10 +88,10 @@ li.nodebb-ezoic-host > .nodebb-ezoic-wrap.ezoic-ad-between { width: 100%; displa
 
 
 
-/* ===== V17.3 piled hide ===== */
-li.nodebb-ezoic-host[data-ezoic-piled="1"] { display: none !important; }
+/* ===== 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.3 ===== */
+/* ===== /V17.5 ===== */