nodebb-plugin-ezoic-infinite 1.6.76 → 1.6.78

package/package.json

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

package/public/client.js

@@ -133,29 +133,7 @@ function tightenEzoicMinHeight(wrap) {
     if (!wrap || !wrap.querySelector) return;
 
     const iframes = wrap.querySelectorAll('iframe');
-
-    // If the wrap is still empty, Ezoic often leaves inline `min-height:400px !important` on
-    // nested `.ezoic-ad` containers, which creates large blank gaps. We can't remove it with CSS.
-    // We collapse those gaps after a short grace period, while still allowing late fill.
-    if (!iframes || !iframes.length) {
-      try {
-        const created = parseInt(wrap.getAttribute('data-created') || '0', 10);
-        const age = created ? (now() - created) : 0;
-        // Give auctions/CMP a bit of time; then collapse the notorious 400px gap.
-        if (age >= 12000) {
-          const nodes = wrap.querySelectorAll('.ezoic-ad, .ezoic-ad-adaptive');
-          nodes.forEach((n) => {
-            const st = (n.getAttribute('style') || '').toLowerCase();
-            if (st.includes('min-height:400') || st.includes('min-height: 400') || st.includes('min-height:400px')) {
-              try { n.style.setProperty('min-height', '1px', 'important'); } catch (e) { n.style.minHeight = '1px'; }
-              try { n.style.setProperty('height', 'auto', 'important'); } catch (e) {}
-              try { n.style.setProperty('line-height', '0', 'important'); } catch (e) {}
-            }
-          });
-        }
-      } catch (e) {}
-      return;
-    }
+    if (!iframes || !iframes.length) return;
 
     // Find the closest "big" ezoic container that carries the 400px min-height.
     const firstIframe = iframes[0];
@@ -763,49 +741,38 @@ function globalGapFixInit() {
       // For message/topic pages we may prune filled or empty orphans if they are far away,
       // otherwise consecutive "stacks" can appear when posts are virtualized.
       const isMessage = (kindClass === 'ezoic-ad-message');
-      // IMPORTANT:
-      // On category/topic lists, NodeBB can virtualize/recycle list items while scrolling.
-      // If we keep *filled* wraps when their anchor items are gone, they can visually
-      // "stack" together on upward scroll. We therefore allow filled wraps to be hidden
-      // when orphaned, but we still avoid fully releasing them (so they can come back
-      // when anchors reappear).
-
-      // If the wrap is anchored to current items, ensure it is visible.
-      if (hasNearbyItem(wrap)) {
-        try { wrap.classList && wrap.classList.remove('ez-orphan-hidden'); wrap.style && (wrap.style.display = ''); } catch (e) {}
-        return;
-      }
-
-      // If the anchor item is no longer in the DOM (virtualized), hide the wrap so ads never 'stack'
-      // back-to-back while scrolling. We'll restore it when its anchor comes back.
-      try { wrap.classList && wrap.classList.add('ez-orphan-hidden'); wrap.style && (wrap.style.display = 'none'); } catch (e) {}
-
-      // On topic/category lists, never release orphan wraps. Releasing moves placeholders around and makes
-      // ads appear to 'travel' from top to bottom as you scroll. Parking (hiding) keeps DOM order stable.
-      const isList = (kindClass === 'ezoic-ad-between' || kindClass === 'ezoic-ad-categories');
-      if (isList) return;
+      if (!isMessage && isFilled(wrap)) return; // never prune filled ads for non-message lists
 
-      // Never release a fresh wrap: it may fill late (auction/CMP). Keep it hidden for a while.
+      // Never prune a fresh wrap: it may fill late.
       try {
         const created = parseInt(wrap.getAttribute('data-created') || '0', 10);
         if (created && (now() - created) < keepEmptyWrapMs()) return;
       } catch (e) {}
 
-      // For message ads: only release if far offscreen to avoid perceived 'vanishing' during fast scroll.
-      if (isMessage) {
-        try {
-          const r = wrap.getBoundingClientRect();
-          const vh = Math.max(1, window.innerHeight || 1);
-          const farAbove = r.bottom < -vh * 2;
-          const farBelow = r.top > vh * 4;
-          if (!farAbove && !farBelow) return;
-        } catch (e) {
-          return;
-        }
-      }
+if (hasNearbyItem(wrap)) {
+  try { wrap.classList && wrap.classList.remove('ez-orphan-hidden'); wrap.style && (wrap.style.display = ''); } catch (e) {}
+  return;
+}
+
+// If the anchor item is no longer in the DOM (virtualized), hide the wrap so ads never "stack"
+// back-to-back while scrolling. We'll recycle it when its anchor comes back.
+try { wrap.classList && wrap.classList.add('ez-orphan-hidden'); wrap.style && (wrap.style.display = 'none'); } catch (e) {}
 
-      withInternalDomChange(() => releaseWrapNode(wrap));
-      removed++;
+// For message ads: only release if far offscreen to avoid perceived "vanishing" during fast scroll.
+if (isMessage) {
+  try {
+    const r = wrap.getBoundingClientRect();
+    const vh = Math.max(1, window.innerHeight || 1);
+    const farAbove = r.bottom < -vh * 2;
+    const farBelow = r.top > vh * 4;
+    if (!farAbove && !farBelow) return;
+  } catch (e) {
+    return;
+  }
+}
+
+withInternalDomChange(() => releaseWrapNode(wrap));
+removed++;
     });
 
     return removed;
@@ -851,12 +818,6 @@ function globalGapFixInit() {
           const prevFilled = isFilled(prev);
           const curFilled = isFilled(w);
 
-          // On topic/category lists, prevent visible stacking by hiding the later wrap immediately.
-          if ((kindClass === 'ezoic-ad-between' || kindClass === 'ezoic-ad-categories') && prevFilled && curFilled) {
-            try { w.classList && w.classList.add('ez-stack-hidden'); w.style && (w.style.display = 'none'); } catch (e) {}
-            break;
-          }
-
           if (curFilled) {
             // If the previous one is empty (and not fresh), drop the previous instead.
             if (!prevFilled && !isFresh(prev)) {
@@ -1058,8 +1019,6 @@ function globalGapFixInit() {
               watchWrapForFill(ww);
               setTimeout(() => { try { tightenEzoicMinHeight(ww); } catch (e) {} }, 900);
               setTimeout(() => { try { tightenEzoicMinHeight(ww); } catch (e) {} }, 2200);
-              // Collapse the notorious 400px inline min-height if the slot stays empty.
-              setTimeout(() => { try { tightenEzoicMinHeight(ww); } catch (e) {} }, 12500);
             }
           } catch (e) {}
           setTimeout(() => { clearTimeout(hardTimer); release(); }, 650);
@@ -1145,7 +1104,7 @@ function buildOrdinalMap(items) {
       if (!id) {
         // Safe mode: disable recycling for topic message ads to prevent visual "jumping"
         // (ads seemingly moving back under the first post during virtualized scroll).
-        const allowRecycle = kindClass !== 'ezoic-ad-message' && kindClass !== 'ezoic-ad-between' && kindClass !== 'ezoic-ad-categories';
+        const allowRecycle = kindClass !== 'ezoic-ad-message';
         recycledWrap = (allowRecycle && scrollDir > 0) ? pickRecyclableWrap(kindClass) : null;
         if (recycledWrap) {
           id = recycledWrap.getAttribute('data-ezoic-wrapid') || '';
@@ -1549,187 +1508,3 @@ function buildOrdinalMap(items) {
   insertHeroAdEarly().catch(() => {});
   requestBurst();
 })();
-
-
-
-// ===== V17 minimal pile-fix (no insert hooks) =====
-(function () {
-  // Goal: keep ad injection intact. Only repair when we detect "pile-up" of between wraps.
-  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 scheduled = false;
-  var lastRun = 0;
-  var COOLDOWN = 180;
-
-  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; }
-  }
-
-  function isHost(node) {
-    return !!(node && node.nodeType === 1 && node.tagName === 'LI' && node.classList && node.classList.contains(HOST_CLASS));
-  }
-
-  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;
-      if (host) return host;
-
-      if (!ul) ul = wrap.closest ? wrap.closest('ul,ol') : null;
-      if (!ul || !(ul.tagName === 'UL' || ul.tagName === 'OL')) return null;
-
-      // Only wrap if direct child of list (invalid / fragile)
-      if (wrap.parentElement === ul) {
-        host = document.createElement('li');
-        host.className = HOST_CLASS;
-        host.setAttribute('role', 'listitem');
-        host.style.listStyle = 'none';
-        host.style.width = '100%';
-        ul.insertBefore(host, wrap);
-        host.appendChild(wrap);
-        try { wrap.style.width = '100%'; } catch (e) {}
-        return host;
-      }
-    } catch (e) {}
-    return null;
-  }
-
-  function previousTopicLi(node) {
-    try {
-      var prev = node.previousElementSibling;
-      while (prev) {
-        if (prev.matches && prev.matches(TOPIC_LI_SEL)) return prev;
-        // skip other hosts/wraps
-        prev = prev.previousElementSibling;
-      }
-    } catch (e) {}
-    return null;
-  }
-
-  function detectPileUp(ul) {
-    // Pile-up signature: 2+ between wraps/hosts adjacent with no topics between, often near top.
-    try {
-      var kids = ul.children;
-      var run = 0;
-      var maxRun = 0;
-      for (var i = 0; i < kids.length; i++) {
-        var el = kids[i];
-        var isBetween = false;
-        if (isHost(el)) {
-          isBetween = !!(el.querySelector && el.querySelector(BETWEEN_WRAP_SEL));
-        } else if (el.matches && el.matches(BETWEEN_WRAP_SEL)) {
-          isBetween = true;
-        }
-        if (isBetween) {
-          run++;
-          if (run > maxRun) maxRun = run;
-        } else if (el.matches && el.matches(TOPIC_LI_SEL)) {
-          run = 0;
-        } else {
-          // other nodes reset lightly
-          run = 0;
-        }
-      }
-      return maxRun >= 2;
-    } catch (e) {}
-    return false;
-  }
-
-  function redistribute(ul) {
-    try {
-      if (!ul) return;
-
-      // Step 1: wrap any direct child between DIVs into LI hosts (makes list stable)
-      ul.querySelectorAll(':scope > ' + BETWEEN_WRAP_SEL).forEach(function(w){ ensureHostForWrap(w, ul); });
-
-      // Step 2: only act if we see pile-up (avoid touching infinite scroll during normal flow)
-      if (!detectPileUp(ul)) return;
-
-      // Move each host to immediately after the closest previous topic LI at its current position.
-      var hosts = ul.querySelectorAll(':scope > li.' + HOST_CLASS);
-      hosts.forEach(function(host){
-        try {
-          var wrap = host.querySelector && host.querySelector(BETWEEN_WRAP_SEL);
-          if (!wrap) return;
-
-          var anchor = previousTopicLi(host);
-          if (!anchor) return; // if none, don't move (prevents yanking to top/bottom)
-
-          if (host.previousElementSibling !== anchor) {
-            anchor.insertAdjacentElement('afterend', host);
-          }
-        } catch (e) {}
-      });
-    } catch (e) {}
-  }
-
-  function schedule(reason) {
-    var now = Date.now();
-    if (now - lastRun < COOLDOWN) return;
-    if (scheduled) return;
-    scheduled = true;
-    requestAnimationFrame(function () {
-      scheduled = false;
-      lastRun = Date.now();
-      try {
-        var ul = getTopicList();
-        if (!ul) return;
-        redistribute(ul);
-      } catch (e) {}
-    });
-  }
-
-  function init() {
-    schedule('init');
-
-    // Observe only the topic list once available
-    try {
-      if (typeof MutationObserver !== 'undefined') {
-        var observeList = function(ul){
-          if (!ul) return;
-          var mo = new MutationObserver(function(muts){
-            // schedule on any change; redistribute() itself is guarded by pile-up detection
-            schedule('mo');
-          });
-          mo.observe(ul, { childList: true, subtree: true });
-        };
-
-        var ul = getTopicList();
-        if (ul) observeList(ul);
-        else {
-          var mo2 = new MutationObserver(function(){
-            var u2 = getTopicList();
-            if (u2) {
-              try { observeList(u2); } catch(e){}
-              try { mo2.disconnect(); } catch(e){}
-            }
-          });
-          mo2.observe(document.documentElement || document.body, { childList: true, subtree: true });
-        }
-      }
-    } catch (e) {}
-
-    // NodeBB events: run after infinite scroll batches
-    if (window.jQuery) {
-      try {
-        window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function(){
-          setTimeout(function(){ schedule('event'); }, 50);
-          setTimeout(function(){ schedule('event2'); }, 400);
-        });
-      } catch (e) {}
-    }
-  }
-
-  if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', init);
-  else init();
-})();
-// ===== /V17 =====
-

package/public/style.css

@@ -79,10 +79,3 @@
   position: static !important;
   top: auto !important;
 }
-
-
-/* ===== V17 host styling ===== */
-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 ===== */
-