nodebb-plugin-ezoic-infinite 1.6.25 → 1.6.27

package/package.json

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

package/public/client.js

@@ -1,39 +1,90 @@
 (function () {
   'use strict';
 
-function ezoicClosestTopicLi(el) {
+function ezoicEnsureBetweenHost(anchorLi, wrap) {
   try {
-    if (!el) return null;
-    if (el.closest) {
-      return el.closest('li[component="category/topic"]') || el.closest('li');
-    }
+    if (!anchorLi || !wrap) return null;
+    var ul = anchorLi.parentElement;
+    if (!ul || !(ul.tagName === 'UL' || ul.tagName === 'OL')) return null;
+
+    // already hosted?
+    var host = wrap.closest ? wrap.closest('li.nodebb-ezoic-host') : null;
+    if (host) return host;
+
+    host = document.createElement('li');
+    host.className = 'nodebb-ezoic-host';
+    host.setAttribute('role', 'listitem');
+    host.style.listStyle = 'none';
+    host.style.width = '100%';
+
+    // copy after position for later repairs
+    try {
+      var after = wrap.getAttribute && wrap.getAttribute('data-ezoic-after');
+      if (after) host.setAttribute('data-ezoic-after', after);
+    } catch (e) {}
+
+    anchorLi.insertAdjacentElement('afterend', host);
+    host.appendChild(wrap);
+    try { wrap.style.width = '100%'; } catch (e) {}
+    return host;
+  } catch (e) {}
+  return null;
+}
+
+function ezoicDesiredAnchorForAfter(ul, afterNum) {
+  try {
+    var n = parseInt(afterNum, 10);
+    if (!n || n < 1) return null;
+    var topics = ul.querySelectorAll('li[component="category/topic"]');
+    if (!topics || !topics.length) return null;
+    if (n > topics.length) n = topics.length;
+    return topics[n-1] || null;
   } catch (e) {}
   return null;
 }
 
-function ezoicPlaceBetweenInLi(target, wrap) {
-  // Place between-ad WRAP inside the previous topic <li>, not as a sibling in the <ul>.
+function ezoicRepairBetweenHosts() {
+  // Reposition between hosts if NodeBB moved them (e.g., to the top/bottom) after virtualized rerender.
   try {
-    var li = ezoicClosestTopicLi(target) || target;
-    if (!li || !wrap) return false;
+    var ul = document.querySelector('li[component="category/topic"]')?.closest('ul,ol');
+    if (!ul) return;
 
-    // avoid duplicates per anchor+after
-    try {
-      var after = wrap.getAttribute && wrap.getAttribute('data-ezoic-after');
-      if (after && li.querySelector) {
-        var existing = li.querySelector('.nodebb-ezoic-wrap.ezoic-ad-between[data-ezoic-after="' + after + '"]');
-        if (existing && existing !== wrap) {
-          try { wrap.remove(); } catch(e) {}
-          return true;
+    // 1) fix invalid ul>div wraps
+    ul.querySelectorAll(':scope > div.nodebb-ezoic-wrap.ezoic-ad-between').forEach(function(wrap){
+      try {
+        var prev = wrap.previousElementSibling;
+        if (prev && prev.tagName === 'LI') {
+          ezoicEnsureBetweenHost(prev, wrap);
         }
-      }
-    } catch (e) {}
+      } catch(e){}
+    });
 
-    try { wrap.setAttribute('data-ezoic-in-li', '1'); } catch (e) {}
-    li.appendChild(wrap);
-    return true;
+    // 2) ensure every between wrap is hosted (but don't scan whole document)
+    ul.querySelectorAll('div.nodebb-ezoic-wrap.ezoic-ad-between').forEach(function(wrap){
+      try {
+        var host = wrap.closest ? wrap.closest('li.nodebb-ezoic-host') : null;
+        if (!host) {
+          var prev = wrap.closest ? wrap.closest('li') : null;
+          if (prev) ezoicEnsureBetweenHost(prev, wrap);
+        }
+      } catch(e){}
+    });
+
+    // 3) reposition hosts based on data-ezoic-after (stable intent)
+    ul.querySelectorAll('li.nodebb-ezoic-host').forEach(function(host){
+      try {
+        var wrap = host.querySelector && host.querySelector('div.nodebb-ezoic-wrap.ezoic-ad-between');
+        if (!wrap) { host.remove(); return; }
+        var after = host.getAttribute('data-ezoic-after') || wrap.getAttribute('data-ezoic-after');
+        if (!after) return;
+        var anchor = ezoicDesiredAnchorForAfter(ul, after);
+        if (!anchor) return;
+        if (host.previousElementSibling !== anchor) {
+          anchor.insertAdjacentElement('afterend', host);
+        }
+      } catch(e){}
+    });
   } catch (e) {}
-  return false;
 }
 
 
@@ -705,7 +756,8 @@ function globalGapFixInit() {
     try {
       const wrap = buildWrap(id, kindClass, afterPos, !existingPh);
       if (kindClass === 'ezoic-ad-between') {
-      if (ezoicPlaceBetweenInLi(target, wrap)) return;
+      var aLi = (target.closest ? (target.closest('li[component="category/topic"]') || target.closest('li')) : null) || (target.tagName==='LI'?target:null);
+      if (aLi) { ezoicEnsureBetweenHost(aLi, wrap); return; }
     }
     target.insertAdjacentElement('afterend', wrap);
 
@@ -1200,7 +1252,8 @@ function buildOrdinalMap(items) {
 
       wrap.setAttribute('data-ezoic-after', String(afterPos));
       if (kindClass === 'ezoic-ad-between') {
-      if (ezoicPlaceBetweenInLi(anchorEl, wrap)) return;
+      var aLi = (anchorEl.closest ? (anchorEl.closest('li[component="category/topic"]') || anchorEl.closest('li')) : null) || (anchorEl.tagName==='LI'?anchorEl:null);
+      if (aLi) { ezoicEnsureBetweenHost(aLi, wrap); return; }
     }
     anchorEl.insertAdjacentElement('afterend', wrap);
 
@@ -1553,26 +1606,16 @@ function buildOrdinalMap(items) {
 
 
 
-// ===== V15 one-shot repair (no heavy observers) =====
-function ezoicRepairBetweenPlacement() {
-  try {
-    var bad = document.querySelectorAll('ul > div.nodebb-ezoic-wrap.ezoic-ad-between, ol > div.nodebb-ezoic-wrap.ezoic-ad-between');
-    bad.forEach(function(wrap){
-      try {
-        var prev = wrap.previousElementSibling;
-        if (prev) ezoicPlaceBetweenInLi(prev, wrap);
-      } catch (e) {}
-    });
-  } catch (e) {}
-}
-try { ezoicRepairBetweenPlacement(); } catch (e) {}
+// ===== V16.1 event-based repair (no scroll, no heavy observers) =====
+try { ezoicRepairBetweenHosts(); } catch(e) {}
 if (window.jQuery) {
   try {
     window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function(){
-      setTimeout(function(){ try { ezoicRepairBetweenPlacement(); } catch(e) {} }, 0);
-      setTimeout(function(){ try { ezoicRepairBetweenPlacement(); } catch(e) {} }, 250);
+      // Let NodeBB settle before repositioning
+      setTimeout(function(){ try { ezoicRepairBetweenHosts(); } catch(e) {} }, 150);
+      setTimeout(function(){ try { ezoicRepairBetweenHosts(); } catch(e) {} }, 700);
     });
-  } catch (e) {}
+  } catch(e) {}
 }
-// ===== /V15 =====
+// ===== /V16.1 =====
 

package/public/style.css

@@ -81,15 +81,8 @@
 }
 
 
-/* ===== V15 between in li ===== */
-li[component="category/topic"] > .nodebb-ezoic-wrap.ezoic-ad-between[data-ezoic-in-li="1"] {
-  display: block;
-  width: 100%;
-  margin-top: 12px;
-  margin-bottom: 12px;
-}
-li[component="category/topic"] > .nodebb-ezoic-wrap.ezoic-ad-between[data-ezoic-in-li="1"] * {
-  max-width: 100%;
-}
-/* ===== /V15 ===== */
+/* ===== V16.1 host li ===== */
+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; }
+/* ===== /V16.1 ===== */