nodebb-plugin-ezoic-infinite 1.6.30 → 1.6.31

package/package.json

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

package/public/client.js

@@ -1514,205 +1514,189 @@ function buildOrdinalMap(items) {
 
 
 
-// ===== V17.2: Up-scroll "rehome" by data-ezoic-after (keeps injection intact) =====
-(function () {
+// ===== V17.3: keep injection; hide top pile on upscroll; rehome EMPTY hosts on downscroll =====
+(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 = 160;
+  var COOLDOWN = 120;
 
-  function getY() {
-    return window.pageYOffset || document.documentElement.scrollTop || 0;
-  }
+  function getY(){ return window.pageYOffset || document.documentElement.scrollTop || 0; }
 
-  function getTopicList() {
+  function getTopicList(){
     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) {
-    try {
-      if (!wrap || wrap.nodeType !== 1) return null;
+  function ensureHostForWrap(wrap, ul){
+    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;
+      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 (!ul || !(ul.tagName==='UL' || ul.tagName==='OL')) return null;
 
-      if (wrap.parentElement === ul) {
+      if (wrap.parentElement === ul){
         host = document.createElement('li');
         host.className = HOST_CLASS;
-        host.setAttribute('role', 'listitem');
-        host.style.listStyle = 'none';
-        host.style.width = '100%';
+        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) {}
+        } catch(e){}
         ul.insertBefore(host, wrap);
         host.appendChild(wrap);
-        try { wrap.style.width = '100%'; } catch (e) {}
+        try { wrap.style.width='100%'; } catch(e){}
         return host;
       }
-    } catch (e) {}
+    }catch(e){}
     return null;
   }
 
-  function nthTopic(ul, n) {
-    try {
+  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 nthTopic(ul, n){
+    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;
+      if (n<1) n=1;
+      if (n>topics.length) n=topics.length;
       return topics[n-1] || null;
-    } catch (e) {}
-    return null;
+    }catch(e){ return null; }
   }
 
-  function getAfterValue(host) {
-    try {
+  function getAfter(host){
+    try{
       var v = host.getAttribute('data-ezoic-after');
-      if (!v) {
+      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;
+      var n = parseInt(v,10);
+      return isNaN(n)? null : n;
+    }catch(e){ return null; }
   }
 
-  function isTopPiled(ul) {
-    try {
+  function detectAndHideTopPile(ul){
+    // Hide piled hosts near top so user doesn't see the stack.
+    try{
       var kids = ul.children;
-      var limit = Math.min(kids.length, 50);
-      var run = 0, maxRun = 0;
+      var limit = Math.min(kids.length, 60);
+      var run = 0;
       for (var i=0;i<limit;i++){
         var el = kids[i];
-        var isAd = false;
-        if (el.tagName === 'LI' && el.classList && el.classList.contains(HOST_CLASS)) {
-          isAd = !!(el.querySelector && el.querySelector(BETWEEN_WRAP_SEL));
-        } else if (el.matches && el.matches(BETWEEN_WRAP_SEL)) {
-          isAd = true;
+        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 (isAd) { run++; if (run>maxRun) maxRun=run; }
-        else if (el.matches && el.matches(TOPIC_LI_SEL)) { run = 0; }
-        else { run = 0; }
       }
-      return maxRun >= 2;
-    } catch (e) {}
-    return false;
+    }catch(e){}
   }
 
-  function rehomeByAfter(ul) {
-    try {
-      if (!ul) return;
-
-      try {
-        ul.querySelectorAll(':scope > ' + BETWEEN_WRAP_SEL).forEach(function(w){ ensureHostForWrap(w, ul); });
-      } catch (e) {}
-
-      if (!isTopPiled(ul)) return;
-
-      var kids = ul.children;
-      var limit = Math.min(kids.length, 80);
-      var topHosts = [];
-      for (var i=0;i<limit;i++){
-        var el = kids[i];
-        if (el.tagName === 'LI' && el.classList && el.classList.contains(HOST_CLASS)) {
-          var wrap = el.querySelector && el.querySelector(BETWEEN_WRAP_SEL);
-          if (wrap) topHosts.push(el);
-        }
-      }
-      if (!topHosts.length) return;
-
-      topHosts.sort(function(a,b){
-        var aa = getAfterValue(a);
-        var bb = getAfterValue(b);
-        if (aa == null && bb == null) return 0;
-        if (aa == null) return 1;
-        if (bb == null) return -1;
-        return aa - bb;
-      });
-
-      topHosts.forEach(function(host){
-        try {
-          var after = getAfterValue(host);
-          var anchor = null;
-          if (after != null) anchor = nthTopic(ul, after);
-
-          if (!anchor) {
-            var prev = host.previousElementSibling;
-            while (prev) {
-              if (prev.matches && prev.matches(TOPIC_LI_SEL)) { anchor = prev; break; }
-              prev = prev.previousElementSibling;
-            }
+  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;
           }
-          if (!anchor) return;
-
-          if (host.previousElementSibling !== anchor) {
+          var after = getAfter(host);
+          var anchor = after!=null ? nthTopic(ul, after) : null;
+          if (anchor){
             anchor.insertAdjacentElement('afterend', host);
           }
-        } catch (e) {}
+          host.removeAttribute(PILED_ATTR);
+        }catch(e){}
       });
-    } catch (e) {}
+    }catch(e){}
   }
 
-  function schedule() {
+  function schedule(fn){
     var now = Date.now();
-    if (now - lastRun < COOLDOWN) return;
+    if (now-lastRun < COOLDOWN) return;
     if (scheduled) return;
     scheduled = true;
     requestAnimationFrame(function(){
-      scheduled = false;
+      scheduled=false;
       lastRun = Date.now();
-      var ul = getTopicList();
-      if (!ul) return;
-      rehomeByAfter(ul);
+      fn();
     });
   }
 
-  function onScroll() {
+  function onScroll(){
     var y = getY();
     var dy = y - lastY;
     lastY = y;
-    if (dy < -8 && y < 900) schedule();
+    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); });
+    }
   }
 
-  function init() {
-    try {
-      var ul = getTopicList();
-      if (ul) ul.querySelectorAll(':scope > ' + BETWEEN_WRAP_SEL).forEach(function(w){ ensureHostForWrap(w, ul); });
-    } catch (e) {}
-
+  function init(){
     window.addEventListener('scroll', onScroll, { passive:true });
 
-    if (window.jQuery) {
-      try {
+    if (window.jQuery){
+      try{
         window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function(){
+          // wrap invalids only
           setTimeout(function(){
-            try {
+            try{
               var ul = getTopicList();
-              if (ul) ul.querySelectorAll(':scope > ' + BETWEEN_WRAP_SEL).forEach(function(w){ ensureHostForWrap(w, ul); });
-            } catch(e){}
+              if (!ul) return;
+              ul.querySelectorAll(':scope > '+BETWEEN_WRAP_SEL).forEach(function(w){ ensureHostForWrap(w, ul); });
+            }catch(e){}
           }, 50);
         });
-      } catch (e) {}
+      }catch(e){}
     }
   }
 
   if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', init);
   else init();
 })();
-// ===== /V17.2 =====
+// ===== /V17.3 =====
 

package/public/style.css

@@ -88,8 +88,10 @@ li.nodebb-ezoic-host > .nodebb-ezoic-wrap.ezoic-ad-between { width: 100%; displa
 
 
 
-/* ===== V17.2 host styling ===== */
+/* ===== V17.3 piled hide ===== */
+li.nodebb-ezoic-host[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.2 ===== */
+/* ===== /V17.3 ===== */