nodebb-plugin-ezoic-infinite 1.6.20 → 1.6.22

package/package.json

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

package/public/client.js

@@ -1511,40 +1511,55 @@ function buildOrdinalMap(items) {
 
 
 
-// ===== V14.3 reconcile by data-ezoic-after (upscroll only, no DOM scanning on downscroll) =====
+// ===== V14.1.2 IO reconcile (visible only) – minimal impact on infinite scroll =====
 (function () {
-  var HOST_CLASS = 'nodebb-ezoic-host';
   var WRAP_SEL = 'div.nodebb-ezoic-wrap.ezoic-ad-between';
-  var TOPIC_LI_SEL = 'li[component="category/topic"]';
-  var lastY = window.pageYOffset || document.documentElement.scrollTop || 0;
+  var HOST_CLASS = 'nodebb-ezoic-host';
+  var io = null;
 
-  function getY() {
-    return window.pageYOffset || document.documentElement.scrollTop || 0;
+  function getListContainer(node) {
+    try {
+      var ul = node && node.closest ? node.closest('ul,ol') : null;
+      if (ul && (ul.tagName === 'UL' || ul.tagName === 'OL')) return ul;
+      var p = node && node.parentElement;
+      while (p) {
+        if (p.tagName === 'UL' || p.tagName === 'OL') return p;
+        p = p.parentElement;
+      }
+    } catch (e) {}
+    return null;
   }
 
-  function getTopicList() {
+  function closestNonHostLi(node) {
     try {
-      var topicLi = document.querySelector(TOPIC_LI_SEL);
-      if (!topicLi) return null;
-      var ul = topicLi.closest ? topicLi.closest('ul,ol') : null;
-      return ul;
-    } catch (e) { return null; }
+      var cur = node;
+      if (!cur) return null;
+      // If inside host, start from host
+      if (cur.closest) {
+        var host = cur.closest('li.' + HOST_CLASS);
+        if (host) cur = host;
+      }
+      var prev = cur.previousElementSibling;
+      while (prev) {
+        if (prev.tagName === 'LI' && !(prev.classList && prev.classList.contains(HOST_CLASS))) return prev;
+        prev = prev.previousElementSibling;
+      }
+    } catch (e) {}
+    return null;
   }
 
-  function ensureValidHostForBetween(wrap) {
-    // Ensure ul/ol does not directly contain div wraps: wrap them in LI host.
+  function ensureHostForWrap(wrap) {
+    // Only repairs invalid UL>DIV. Does NOT move around the list except wrapping in-place.
     try {
       if (!wrap || wrap.nodeType !== 1) return null;
       if (!(wrap.matches && wrap.matches(WRAP_SEL))) return null;
-      var ul = wrap.parentElement;
-      while (ul && !(ul.tagName === 'UL' || ul.tagName === 'OL')) ul = ul.parentElement;
-      if (!ul) return null;
 
-      // If already inside host, return host
       var host = wrap.closest ? wrap.closest('li.' + HOST_CLASS) : null;
       if (host) return host;
 
-      // If direct child of UL/OL, create host and move wrap into it
+      var ul = getListContainer(wrap);
+      if (!ul) return null;
+
       if (wrap.parentElement === ul) {
         host = document.createElement('li');
         host.className = HOST_CLASS;
@@ -1560,98 +1575,105 @@ function buildOrdinalMap(items) {
     return null;
   }
 
-  function desiredAnchorByAfter(ul, afterNum) {
-    // afterNum is like 6/12/18 etc. It means "after nth topic".
-    // We'll locate the nth topic LI currently in DOM (1-indexed), then anchor after it.
+  function reconcileHostPosition(host) {
+    // Moves ONLY the one host we are currently handling (visible or just inserted).
     try {
-      if (!ul || !afterNum) return null;
-      var n = parseInt(afterNum, 10);
-      if (!n || n < 1) return null;
-      var topics = ul.querySelectorAll(TOPIC_LI_SEL);
-      if (!topics || !topics.length) return null;
-      // clamp to range
-      if (n > topics.length) n = topics.length;
-      return topics[n - 1];
-    } catch (e) { return null; }
-  }
+      if (!host || host.nodeType !== 1) return;
+      var ul = getListContainer(host);
+      if (!ul) return;
 
-  function reconcileHostsUpScroll() {
-    var ul = getTopicList();
-    if (!ul) return;
+      var anchorLi = closestNonHostLi(host);
+      if (!anchorLi) return;
+
+      if (host.previousElementSibling !== anchorLi) {
+        anchorLi.insertAdjacentElement('afterend', host);
+      }
+    } catch (e) {}
+  }
 
-    // 1) Repair invalid wraps (cheap)
+  function observeHost(host) {
     try {
-      ul.querySelectorAll(':scope > ' + WRAP_SEL).forEach(function(w){ ensureValidHostForBetween(w); });
+      if (!host) return;
+      if (!io) return;
+      io.observe(host);
     } catch (e) {}
+  }
 
-    // 2) Only on upscroll: move hosts back to their after-index positions if they drifted.
-    var y = getY();
-    var dy = y - lastY;
-    lastY = y;
-    if (dy >= -10) return;
+  function initIO() {
+    if (io || typeof IntersectionObserver === 'undefined') return;
+    io = new IntersectionObserver(function (entries) {
+      try {
+        entries.forEach(function (e) {
+          if (!e || !e.isIntersecting || !e.target) return;
+          // When host is near viewport, reconcile once.
+          reconcileHostPosition(e.target);
+        });
+      } catch (e) {}
+    }, { root: null, rootMargin: '800px 0px 800px 0px', threshold: 0.01 });
+  }
 
+  function processWrap(wrap) {
     try {
-      var hosts = ul.querySelectorAll('li.' + HOST_CLASS);
-      hosts.forEach(function(host){
-        try {
-          var wrap = host.querySelector && host.querySelector(WRAP_SEL);
-          if (!wrap) { host.remove(); return; }
-
-          var afterNum = wrap.getAttribute('data-ezoic-after') || host.getAttribute('data-ezoic-after') || '';
-          if (!afterNum) return;
+      var host = ensureHostForWrap(wrap) || (wrap.closest ? wrap.closest('li.' + HOST_CLASS) : null);
+      if (host) {
+        // reconcile immediately only for the newly processed node (cheap)
+        reconcileHostPosition(host);
+        observeHost(host);
+      }
+    } catch (e) {}
+  }
 
-          var anchor = desiredAnchorByAfter(ul, afterNum);
-          if (!anchor) {
-            // if we can't anchor, remove to prevent piling
-            host.remove();
-            return;
-          }
+  function scanInitial() {
+    try {
+      document.querySelectorAll(WRAP_SEL).forEach(processWrap);
+    } catch (e) {}
+  }
 
-          if (host.previousElementSibling !== anchor) {
-            anchor.insertAdjacentElement('afterend', host);
+  function installMO() {
+    try {
+      if (typeof MutationObserver === 'undefined') return;
+      var mo = new MutationObserver(function (muts) {
+        try {
+          for (var i = 0; i < muts.length; i++) {
+            var m = muts[i];
+            if (!m.addedNodes || !m.addedNodes.length) continue;
+
+            for (var j = 0; j < m.addedNodes.length; j++) {
+              var n = m.addedNodes[j];
+              if (!n || n.nodeType !== 1) continue;
+
+              if (n.matches && n.matches(WRAP_SEL)) {
+                processWrap(n);
+              } else if (n.querySelectorAll) {
+                var inner = n.querySelectorAll(WRAP_SEL);
+                if (inner && inner.length) inner.forEach(processWrap);
+              }
+            }
           }
         } catch (e) {}
       });
+      mo.observe(document.documentElement || document.body, { childList: true, subtree: true });
     } catch (e) {}
   }
 
-  // Throttled scheduler (scroll)
-  var pending = false;
-  var lastRun = 0;
-  var COOLDOWN = 160;
-
-  function schedule() {
-    var now = Date.now();
-    if (now - lastRun < COOLDOWN) return;
-    if (pending) return;
-    pending = true;
-    requestAnimationFrame(function(){
-      pending = false;
-      lastRun = Date.now();
-      reconcileHostsUpScroll();
-    });
-  }
-
   function init() {
-    // initial repair only
-    try {
-      var ul = getTopicList();
-      if (ul) ul.querySelectorAll(':scope > ' + WRAP_SEL).forEach(function(w){ ensureValidHostForBetween(w); });
-    } catch (e) {}
-
-    window.addEventListener('scroll', schedule, { passive: true });
-    window.addEventListener('resize', schedule, { passive: true });
+    initIO();
+    scanInitial();
+    installMO();
 
     if (window.jQuery) {
-      window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function(){
-        setTimeout(schedule, 0);
-        setTimeout(schedule, 300);
-      });
+      try {
+        window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function () {
+          // do a light rescan (no scroll listeners)
+          setTimeout(scanInitial, 0);
+          setTimeout(scanInitial, 250);
+        });
+      } catch (e) {}
     }
   }
 
   if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', init);
   else init();
 })();
-// ===== /V14.3 =====
+// ===== /V14.1.2 =====
 

package/public/style.css

@@ -81,7 +81,7 @@
 }
 
 
-/* ===== V14.3 host ===== */
+/* ===== V14.1.2 host ===== */
 li.nodebb-ezoic-host { list-style: none; width: 100%; }
-/* ===== /V14.3 ===== */
+/* ===== /V14.1.2 ===== */