nodebb-plugin-ezoic-infinite 1.5.98 → 1.5.99

package/package.json

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

package/public/client.js

@@ -1344,70 +1344,92 @@ function buildOrdinalMap(items) {
 
 
 
-
-
-
-// ===== V7.1 soft up-scroll purge for ezoic-ad-between =====
+// ===== V8 between-cap-per-window =====
 (function () {
-  var lastY = window.pageYOffset || document.documentElement.scrollTop || 0;
   var ticking = false;
-  var lastPurgeTs = 0;
-  var PURGE_COOLDOWN_MS = 350;
+  var lastRun = 0;
+  var RUN_COOLDOWN = 220; // ms
+
+  // Keep at most N between-wraps per vertical band around viewport
+  var BAND_PX = 900;
+  var MAX_PER_BAND = 2;
 
-  function softPurgeBetweenWraps() {
+  function capBetweenWraps() {
     var now = Date.now();
-    if (now - lastPurgeTs < PURGE_COOLDOWN_MS) return;
-    lastPurgeTs = now;
+    if (now - lastRun < RUN_COOLDOWN) return;
+    lastRun = now;
 
-    var viewportTop = window.pageYOffset || document.documentElement.scrollTop || 0;
-    var keepBuffer = 240; // garde les pubs proches du viewport pour éviter le "clignotement"
+    var wraps;
+    try { wraps = Array.prototype.slice.call(document.querySelectorAll('.nodebb-ezoic-wrap.ezoic-ad-between')); }
+    catch (e) { return; }
 
-    try {
-      document.querySelectorAll('.nodebb-ezoic-wrap.ezoic-ad-between').forEach(function (w) {
-        try {
-          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) {}
+    if (!wraps.length) return;
+
+    var y = window.pageYOffset || document.documentElement.scrollTop || 0;
+    var viewportTop = y;
+    var viewportBottom = y + (window.innerHeight || document.documentElement.clientHeight || 0);
+
+    // Priorité: conserver ce qui est proche/visible, limiter le reste par bande
+    var buckets = Object.create(null);
+
+    wraps.forEach(function (w) {
+      try {
+        var r = w.getBoundingClientRect();
+        var absTop = y + r.top;
+        var absBottom = y + r.bottom;
+
+        var inOrNearViewport = (absBottom >= viewportTop - 200) && (absTop <= viewportBottom + 200);
+        var band = Math.floor(absTop / BAND_PX);
+        var key = String(band);
+
+        if (!buckets[key]) buckets[key] = [];
+        buckets[key].push({
+          node: w,
+          absTop: absTop,
+          absBottom: absBottom,
+          inOrNearViewport: inOrNearViewport
+        });
+      } catch (e) {}
+    });
+
+    Object.keys(buckets).forEach(function (k) {
+      var arr = buckets[k];
+      // garde d'abord proche/visible, puis les plus récents (data-created), puis position
+      arr.sort(function (a, b) {
+        if (a.inOrNearViewport !== b.inOrNearViewport) return a.inOrNearViewport ? -1 : 1;
+        var ac = parseInt((a.node.getAttribute('data-created') || '0'), 10);
+        var bc = parseInt((b.node.getAttribute('data-created') || '0'), 10);
+        if (ac !== bc) return bc - ac; // garder plus récent
+        return a.absTop - b.absTop;
       });
-    } catch (e) {}
+
+      for (var i = MAX_PER_BAND; i < arr.length; i++) {
+        try { arr[i].node.remove(); } catch (e) {}
+      }
+    });
   }
 
-  function onScroll() {
+  function scheduleCap() {
     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;
+      try { capBetweenWraps(); } catch (e) {}
       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);
-  }
+  window.addEventListener('scroll', scheduleCap, { passive: true });
+  window.addEventListener('resize', scheduleCap, { passive: true });
 
   if (window.jQuery) {
-    window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', postLoadSoftPurge);
+    window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function () {
+      setTimeout(scheduleCap, 0);
+      setTimeout(scheduleCap, 200);
+      setTimeout(scheduleCap, 700);
+    });
   }
 
-  // premier passage
-  setTimeout(softPurgeBetweenWraps, 0);
+  setTimeout(scheduleCap, 0);
 })();
-// ===== /V7.1 =====
+// ===== /V8 =====