nodebb-plugin-ezoic-infinite 1.6.26 → 1.6.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "1.6.26",
+  "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,40 +1,90 @@
 (function () {
   'use strict';
 
-function ezoicInsertAfterTopicHost(target, wrap, kindClass) {
+function ezoicEnsureBetweenHost(anchorLi, wrap) {
   try {
-    if (!target || !wrap) return false;
-    if (kindClass !== 'ezoic-ad-between') return false;
-
-    // Ensure we insert a LI host that looks like a topic item so NodeBB list virtualization keeps ordering.
-    var anchorLi = target.closest ? (target.closest('li[component="category/topic"]') || target.closest('li')) : null;
-    if (!anchorLi && target.tagName === 'LI') anchorLi = target;
-    if (!anchorLi) return false;
-
+    if (!anchorLi || !wrap) return null;
     var ul = anchorLi.parentElement;
-    if (!ul || !(ul.tagName === 'UL' || ul.tagName === 'OL')) return false;
+    if (!ul || !(ul.tagName === 'UL' || ul.tagName === 'OL')) return null;
 
-    // If wrap already hosted, do nothing
-    var existingHost = wrap.closest ? wrap.closest('li.nodebb-ezoic-host') : null;
-    if (existingHost) return true;
+    // already hosted?
+    var host = wrap.closest ? wrap.closest('li.nodebb-ezoic-host') : null;
+    if (host) return host;
 
-    var host = document.createElement('li');
+    host = document.createElement('li');
     host.className = 'nodebb-ezoic-host';
-    // mimic topic list item so NodeBB doesn't relocate it
-    host.setAttribute('component', 'category/topic');
-    host.setAttribute('data-ezoic-host', 'between');
+    host.setAttribute('role', 'listitem');
     host.style.listStyle = 'none';
     host.style.width = '100%';
 
-    // Insert host after anchorLi
-    if (anchorLi.insertAdjacentElement) anchorLi.insertAdjacentElement('afterend', host);
-    else ul.insertBefore(host, anchorLi.nextSibling);
+    // 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 true;
+    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 ezoicRepairBetweenHosts() {
+  // Reposition between hosts if NodeBB moved them (e.g., to the top/bottom) after virtualized rerender.
+  try {
+    var ul = document.querySelector('li[component="category/topic"]')?.closest('ul,ol');
+    if (!ul) return;
+
+    // 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){}
+    });
+
+    // 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 +755,10 @@ function globalGapFixInit() {
     insertingIds.add(id);
     try {
       const wrap = buildWrap(id, kindClass, afterPos, !existingPh);
-      if (ezoicInsertAfterTopicHost(target, wrap, kindClass)) return;
+      if (kindClass === 'ezoic-ad-between') {
+      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);
 
       // If placeholder exists elsewhere (including pool), move it into the wrapper.
@@ -1198,7 +1251,10 @@ function buildOrdinalMap(items) {
       if (!anchorEl || !wrap || !wrap.isConnected) return null;
 
       wrap.setAttribute('data-ezoic-after', String(afterPos));
-      if (ezoicInsertAfterTopicHost(anchorEl, wrap, kindClass)) return;
+      if (kindClass === 'ezoic-ad-between') {
+      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);
 
       // Ensure minimal layout impact.
@@ -1550,27 +1606,16 @@ function buildOrdinalMap(items) {
 
 
 
-// ===== V16 repair invalid UL children (between) =====
-function ezoicRepairBetweenHosts() {
-  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) return;
-        ezoicInsertAfterTopicHost(prev, wrap, 'ezoic-ad-between');
-      } catch (e) {}
-    });
-  } catch (e) {}
-}
-try { ezoicRepairBetweenHosts(); } 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 { ezoicRepairBetweenHosts(); } catch(e) {} }, 0);
-      setTimeout(function(){ try { ezoicRepairBetweenHosts(); } 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) {}
 }
-// ===== /V16 =====
+// ===== /V16.1 =====
 

package/public/style.css

@@ -81,14 +81,8 @@
 }
 
 
-/* ===== V16 host topic li ===== */
-li.nodebb-ezoic-host[component="category/topic"]{
-  list-style:none;
-  width:100%;
-}
-/* ensure host doesn't inherit topic card layout */
-li.nodebb-ezoic-host[component="category/topic"] > .nodebb-ezoic-wrap.ezoic-ad-between{
-  width:100%;
-}
-/* ===== /V16 ===== */
+/* ===== 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 ===== */