nodebb-plugin-ezoic-infinite 1.5.96 → 1.5.98

package/package.json

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

package/public/client.js

@@ -704,143 +704,12 @@ function globalGapFixInit() {
   }
 
   function pruneOrphanWraps(kindClass, items) {
-    // Topic pages can be virtualized (posts removed from DOM as you scroll).
-    // When that happens, previously-inserted ad wraps may become "orphan" nodes with no
-    // nearby post containers, which leads to ads clustering together when scrolling back up.
-    // We prune only *true* orphans that are far offscreen to keep the UI stable.
-    if (!items || !items.length) return 0;
-    const itemSet = new Set(items);
-    const wraps = document.querySelectorAll(`.${WRAP_CLASS}.${kindClass}`);
-    let removed = 0;
-
-    const isFilled = (wrap) => {
-      return !!(wrap.querySelector('iframe, ins, img, video, [data-google-container-id]'));
-    };
-
-    const hasNearbyItem = (wrap) => {
-      // NodeBB/skins can inject separators/spacers; be tolerant.
-      let prev = wrap.previousElementSibling;
-      for (let i = 0; i < 14 && prev; i++) {
-        if (itemSet.has(prev)) return true;
-        prev = prev.previousElementSibling;
-      }
-      let next = wrap.nextElementSibling;
-      for (let i = 0; i < 14 && next; i++) {
-        if (itemSet.has(next)) return true;
-        next = next.nextElementSibling;
-      }
-      return false;
-    };
-
-    wraps.forEach((wrap) => {
-      // Never prune pinned placements.
-      try {
-        if (wrap.getAttribute('data-ezoic-pin') === '1') return;
-      } catch (e) {}
-
-      // 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');
-      if (!isMessage && isFilled(wrap)) return; // never prune filled ads for non-message lists
-
-      // 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) {}
-
-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) {}
-
-// 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;
-  }
-
   function decluster(kindClass) {
-    // Remove "near-consecutive" wraps (keep the first). Be tolerant of spacer nodes.
-    const wraps = Array.from(document.querySelectorAll(`.${WRAP_CLASS}.${kindClass}`));
-    if (wraps.length < 2) return 0;
-
-    const isWrap = (el) => !!(el && el.classList && el.classList.contains(WRAP_CLASS));
-
-    const isFilled = (wrap) => {
-      return !!(wrap && wrap.querySelector && wrap.querySelector('iframe, ins, img, video, [data-google-container-id]'));
-    };
-
-    const isFresh = (wrap) => {
-      try {
-        const created = parseInt(wrap.getAttribute('data-created') || '0', 10);
-        return created && (now() - created) < keepEmptyWrapMs();
-      } catch (e) {
-        return false;
-      }
-    };
-
-    let removed = 0;
-    for (const w of wraps) {
-      // Never decluster pinned placements.
-      try {
-        if (w.getAttribute && w.getAttribute('data-ezoic-pin') === '1') continue;
-      } catch (e) {}
-
-      let prev = w.previousElementSibling;
-      for (let i = 0; i < 3 && prev; i++) {
-        if (isWrap(prev)) {
-          // If the previous wrap is pinned, keep this one (spacing is intentional).
-          try {
-            if (prev.getAttribute && prev.getAttribute('data-ezoic-pin') === '1') break;
-          } catch (e) {}
-
-          // Never remove a wrap that is already filled; otherwise it looks like
-          // ads "disappear" while scrolling. Only remove the empty neighbour.
-          const prevFilled = isFilled(prev);
-          const curFilled = isFilled(w);
-
-          if (curFilled) {
-            // If the previous one is empty (and not fresh), drop the previous instead.
-            if (!prevFilled && !isFresh(prev)) {
-              withInternalDomChange(() => releaseWrapNode(prev));
-              removed++;
-            }
-            break;
-          }
-
-          // Current is empty.
-          // Don't decluster two "fresh" empty wraps — it can reduce fill on slow auctions.
-          // Only decluster when previous is filled, or when current is stale.
-          if (prevFilled || !isFresh(w)) {
-            withInternalDomChange(() => releaseWrapNode(w));
-            removed++;
-          }
-          break;
-        }
-        prev = prev.previousElementSibling;
-      }
-    }
-    return removed;
-  }
+  return;
+}
 
   // ---------------- show (preload / fast fill) ----------------
 
@@ -1475,86 +1344,70 @@ function buildOrdinalMap(items) {
 
 
 
-// ===== V6.5 AMP-off-between patch =====
-(function () {
-  function neutralizeAmpInaboxBetween(root) {
-    var scope = root || document;
-    var wraps;
-    try { wraps = scope.querySelectorAll('.nodebb-ezoic-wrap.ezoic-ad-between'); } catch (e) { return; }
-    wraps.forEach(function (wrap) {
-      try {
-        wrap.querySelectorAll('.ezads-sticky-intradiv, [style*="position: sticky"], [style*="position:sticky"]').forEach(function (n) {
-          try { n.style.setProperty('position', 'static', 'important'); } catch (e) {}
-          try { n.style.setProperty('top', 'auto', 'important'); } catch (e) {}
-          try { n.style.setProperty('z-index', '0', 'important'); } catch (e) {}
-          try { n.classList.remove('ezads-sticky-intradiv'); } catch (e) {}
-        });
 
-        wrap.querySelectorAll('iframe[src*="safeframe"], iframe[src*="ampproject"], iframe[src*="doubleclick"]').forEach(function (f) {
-          try { f.style.setProperty('position', 'static', 'important'); } catch (e) {}
-          try { f.style.setProperty('top', 'auto', 'important'); } catch (e) {}
-          try { f.style.setProperty('transform', 'none', 'important'); } catch (e) {}
-          try { f.style.setProperty('margin', '0 auto', 'important'); } catch (e) {}
-        });
 
-        wrap.querySelectorAll('iframe').forEach(function (f) {
-          var p = f.parentElement;
-          if (!p) return;
-          try { p.style.setProperty('position', 'static', 'important'); } catch (e) {}
-          try { p.style.setProperty('top', 'auto', 'important'); } catch (e) {}
-          try { p.style.setProperty('transform', 'none', 'important'); } catch (e) {}
-        });
-      } catch (e) {}
-    });
-  }
 
-  function installNeutralizer() {
-    try {
-      if (window.__ezoicAmpBetweenNeutralizerInstalled) return;
-      window.__ezoicAmpBetweenNeutralizerInstalled = true;
+// ===== V7.1 soft up-scroll purge for ezoic-ad-between =====
+(function () {
+  var lastY = window.pageYOffset || document.documentElement.scrollTop || 0;
+  var ticking = false;
+  var lastPurgeTs = 0;
+  var PURGE_COOLDOWN_MS = 350;
+
+  function softPurgeBetweenWraps() {
+    var now = Date.now();
+    if (now - lastPurgeTs < PURGE_COOLDOWN_MS) return;
+    lastPurgeTs = now;
 
-      neutralizeAmpInaboxBetween(document);
+    var viewportTop = window.pageYOffset || document.documentElement.scrollTop || 0;
+    var keepBuffer = 240; // garde les pubs proches du viewport pour éviter le "clignotement"
 
-      var mo = new MutationObserver(function (muts) {
+    try {
+      document.querySelectorAll('.nodebb-ezoic-wrap.ezoic-ad-between').forEach(function (w) {
         try {
-          muts.forEach(function (m) {
-            if (!m.addedNodes) return;
-            m.addedNodes.forEach(function (n) {
-              if (!n || n.nodeType !== 1) return;
-              if (n.matches && n.matches('.nodebb-ezoic-wrap.ezoic-ad-between')) {
-                neutralizeAmpInaboxBetween(n.parentNode || document);
-              } else if (n.querySelectorAll && n.querySelector('.nodebb-ezoic-wrap.ezoic-ad-between')) {
-                neutralizeAmpInaboxBetween(n);
-              }
-            });
-          });
+          var r = w.getBoundingClientRect();
+          var absBottom = viewportTop + r.bottom;
+          // SOFT: supprimer uniquement les wraps largement au-dessus du viewport
+          if (absBottom < (viewportTop - keepBuffer)) {
+            w.remove();
+          }
         } catch (e) {}
       });
-      mo.observe(document.documentElement || document.body, { childList: true, subtree: true });
-
-      var t = null;
-      window.addEventListener('scroll', function () {
-        if (t) return;
-        t = setTimeout(function () {
-          t = null;
-          neutralizeAmpInaboxBetween(document);
-        }, 120);
-      }, { passive: true });
-
-      if (window.jQuery) {
-        window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function () {
-          setTimeout(function(){ neutralizeAmpInaboxBetween(document); }, 0);
-          setTimeout(function(){ neutralizeAmpInaboxBetween(document); }, 300);
-        });
-      }
     } catch (e) {}
   }
 
-  if (document.readyState === 'loading') {
-    document.addEventListener('DOMContentLoaded', installNeutralizer);
-  } else {
-    installNeutralizer();
+  function onScroll() {
+    if (ticking) return;
+    ticking = true;
+    requestAnimationFrame(function () {
+      var y = window.pageYOffset || document.documentElement.scrollTop || 0;
+      var dy = y - lastY;
+
+      // uniquement quand on remonte franchement
+      if (dy < -12) {
+        softPurgeBetweenWraps();
+      }
+
+      lastY = y;
+      ticking = false;
+    });
+  }
+
+  window.addEventListener('scroll', onScroll, { passive: true });
+
+  // nettoyage doux après chargement infini / navigation ajax
+  function postLoadSoftPurge() {
+    setTimeout(softPurgeBetweenWraps, 0);
+    setTimeout(softPurgeBetweenWraps, 220);
+    setTimeout(softPurgeBetweenWraps, 600);
+  }
+
+  if (window.jQuery) {
+    window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', postLoadSoftPurge);
   }
+
+  // premier passage
+  setTimeout(softPurgeBetweenWraps, 0);
 })();
-/// ===== /V6.5 =====
+// ===== /V7.1 =====
 

package/public/style.css

@@ -79,15 +79,3 @@
   position: static !important;
   top: auto !important;
 }
-
-
-/* ===== V6.5 fallback CSS: disable sticky behavior in between wrappers ===== */
-.nodebb-ezoic-wrap.ezoic-ad-between .ezads-sticky-intradiv,
-.nodebb-ezoic-wrap.ezoic-ad-between [style*="position: sticky"],
-.nodebb-ezoic-wrap.ezoic-ad-between [style*="position:sticky"] {
-  position: static !important;
-  top: auto !important;
-  transform: none !important;
-}
-/* ===== /V6.5 ===== */
-