nodebb-plugin-ezoic-infinite 1.6.16 → 1.6.18

package/package.json

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

package/public/client.js

@@ -1511,103 +1511,172 @@ function buildOrdinalMap(items) {
 
 
 
-// ===== V13 sticky-killer for Ezoic/AMP in list ads =====
+// ===== V14.1 Hook any between-wrap and tether to nearest topic LI =====
 (function () {
-  // Hypothesis: the "pile at top" is a visual effect from multiple sticky intradiv ads
-  // (ezads-sticky-intradiv with inline !important). We neutralize sticky continuously.
+  var BETWEEN_SEL = 'div.nodebb-ezoic-wrap.ezoic-ad-between';
+  var HOST_CLASS = 'nodebb-ezoic-host';
+  var TOKEN_ATTR = 'data-ezoic-anchor-token';
+  var pendingSweep = false;
+  var lastSweep = 0;
+  var COOLDOWN = 120;
+
+  function token() {
+    try { return String(Date.now()) + '-' + Math.random().toString(16).slice(2); } catch (e) { return String(Date.now()); }
+  }
 
-  function killStickyIn(root) {
+  function closestTopicLi(node) {
+    // Find the topic <li> that this wrap should be associated with:
+    // prefer previous sibling <li> that is NOT a host, else climb to nearest previous in the list.
     try {
-      var scope = root || document;
-      var nodes = scope.querySelectorAll('.nodebb-ezoic-wrap .ezads-sticky-intradiv, .nodebb-ezoic-wrap [style*="position: sticky"], .nodebb-ezoic-wrap [style*="position:sticky"]');
-      nodes.forEach(function(n){
-        try {
-          n.style.setProperty('position', 'static', 'important');
-          n.style.setProperty('top', 'auto', 'important');
-          n.style.setProperty('bottom', 'auto', 'important');
-          n.style.setProperty('left', 'auto', 'important');
-          n.style.setProperty('right', 'auto', 'important');
-          // if they force translate/transform for sticky, remove it
-          n.style.setProperty('transform', 'none', 'important');
-          n.style.setProperty('will-change', 'auto', 'important');
-          // also remove class to reduce re-application
-          if (n.classList) n.classList.remove('ezads-sticky-intradiv');
-        } catch (e) {}
-        // If inline style string contains "sticky", scrub it (some libs reparse cssText)
+      if (!node) return null;
+      var cur = node;
+      // If wrap is inside a host li, start from host
+      if (cur.closest) {
+        var host = cur.closest('li.' + HOST_CLASS);
+        if (host) cur = host;
+      }
+      // Find list container
+      var ul = cur.parentElement;
+      while (ul && !(ul.tagName === 'UL' || ul.tagName === 'OL')) ul = ul.parentElement;
+      if (!ul) return null;
+
+      // Start from current element position within ul
+      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 ensureHostForWrap(wrap) {
+    try {
+      if (!wrap || wrap.nodeType !== 1) return;
+      if (!(wrap.matches && wrap.matches(BETWEEN_SEL))) return;
+
+      // Already in a host?
+      var host = wrap.closest ? wrap.closest('li.' + HOST_CLASS) : null;
+      var ul = wrap.parentElement;
+      while (ul && !(ul.tagName === 'UL' || ul.tagName === 'OL')) ul = ul.parentElement;
+      if (!ul) return;
+
+      // Ensure wrap is inside UL only via LI host (never direct ul>div)
+      if (!host) {
+        host = document.createElement('li');
+        host.className = HOST_CLASS;
+        host.setAttribute('role', 'listitem');
+        host.style.listStyle = 'none';
+        host.style.width = '100%';
+        // Insert host at wrap position
+        ul.insertBefore(host, wrap);
+        host.appendChild(wrap);
+      } else if (host.parentElement !== ul) {
+        // move host into correct list container if needed
+        ul.appendChild(host);
+      }
+
+      // Tether to nearest topic li and tag both with same token
+      var anchorLi = closestTopicLi(host) || closestTopicLi(wrap);
+      if (anchorLi) {
+        var t = anchorLi.getAttribute(TOKEN_ATTR);
+        if (!t) {
+          t = token();
+          anchorLi.setAttribute(TOKEN_ATTR, t);
+        }
+        host.setAttribute(TOKEN_ATTR, t);
+        // keep host just after anchor
+        if (host.previousElementSibling !== anchorLi) {
+          anchorLi.insertAdjacentElement('afterend', host);
+        }
+      } else {
+        // No anchor -> it's dangerous; mark host so we can drop it later
+        host.setAttribute('data-ezoic-orphan', '1');
+      }
+    } catch (e) {}
+  }
+
+  function sweepAll() {
+    var now = Date.now();
+    if (now - lastSweep < COOLDOWN) return;
+    lastSweep = now;
+
+    try {
+      // 1) repair direct ul>div wraps
+      var bad = document.querySelectorAll('ul > ' + BETWEEN_SEL + ', ol > ' + BETWEEN_SEL);
+      bad.forEach(ensureHostForWrap);
+
+      // 2) ensure any between wrap anywhere is hosted+tethered
+      var wraps = document.querySelectorAll(BETWEEN_SEL);
+      wraps.forEach(ensureHostForWrap);
+
+      // 3) reconcile/drop hosts that lost their anchor (virtualized)
+      var hosts = document.querySelectorAll('li.' + HOST_CLASS + '[' + TOKEN_ATTR + ']');
+      hosts.forEach(function(host){
         try {
-          var st = n.getAttribute && n.getAttribute('style');
-          if (st && (st.indexOf('sticky') !== -1)) {
-            var cleaned = st.replace(/position\s*:\s*sticky\s*!important\s*;?/gi, 'position: static !important;')
-                            .replace(/position\s*:\s*sticky\s*;?/gi, 'position: static;')
-                            .replace(/top\s*:\s*0px\s*!important\s*;?/gi, 'top: auto !important;')
-                            .replace(/top\s*:\s*0px\s*;?/gi, 'top: auto;');
-            n.setAttribute('style', cleaned);
+          var ul = host.parentElement;
+          if (!ul) { host.remove(); return; }
+          var t = host.getAttribute(TOKEN_ATTR);
+          if (!t) { host.remove(); return; }
+          var anchor = ul.querySelector('li[' + TOKEN_ATTR + '="' + t + '"]');
+          if (!anchor) {
+            host.remove();
+            return;
+          }
+          if (host.previousElementSibling !== anchor) {
+            anchor.insertAdjacentElement('afterend', host);
           }
         } catch (e) {}
       });
+
+      // 4) drop explicit orphans
+      var orphans = document.querySelectorAll('li.' + HOST_CLASS + '[data-ezoic-orphan="1"]');
+      orphans.forEach(function(h){ try { h.remove(); } catch(e) {} });
     } catch (e) {}
   }
 
-  function install() {
-    // initial pass
-    killStickyIn(document);
-
-    // Throttled scroll pass (in case scripts reapply on scroll)
-    var t = null;
-    window.addEventListener('scroll', function(){
-      if (t) return;
-      t = setTimeout(function(){ t = null; killStickyIn(document); }, 120);
-    }, { passive: true });
+  function scheduleSweep() {
+    if (pendingSweep) return;
+    pendingSweep = true;
+    requestAnimationFrame(function(){
+      pendingSweep = false;
+      sweepAll();
+    });
+  }
 
-    // MutationObserver to catch late injections / style changes
+  function installObservers() {
+    // Observe the document for any between-wrap insertion/moves
     try {
       if (typeof MutationObserver !== 'undefined') {
         var mo = new MutationObserver(function(muts){
-          try {
-            for (var i=0;i<muts.length;i++){
-              var m = muts[i];
-              if (m.type === 'attributes') {
-                // style/class changed
-                if (m.attributeName === 'style' || m.attributeName === 'class') {
-                  killStickyIn(m.target && m.target.closest ? (m.target.closest('.nodebb-ezoic-wrap') || document) : document);
-                }
-              } else if (m.addedNodes && m.addedNodes.length) {
-                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('.nodebb-ezoic-wrap') || n.matches('.ezads-sticky-intradiv'))) {
-                    killStickyIn(n);
-                  } else if (n.querySelector) {
-                    if (n.querySelector('.nodebb-ezoic-wrap, .ezads-sticky-intradiv')) killStickyIn(n);
-                  }
-                }
-              }
-            }
-          } catch (e) {}
-        });
-        mo.observe(document.documentElement || document.body, {
-          subtree: true,
-          childList: true,
-          attributes: true,
-          attributeFilter: ['style','class']
+          for (var i=0;i<muts.length;i++){
+            var m = muts[i];
+            if (m.addedNodes && m.addedNodes.length) { scheduleSweep(); break; }
+            if (m.removedNodes && m.removedNodes.length) { scheduleSweep(); break; }
+          }
         });
+        mo.observe(document.documentElement || document.body, { childList: true, subtree: true });
       }
     } catch (e) {}
+  }
+
+  function init() {
+    scheduleSweep();
+    window.addEventListener('scroll', scheduleSweep, { passive: true });
+    window.addEventListener('resize', scheduleSweep, { passive: true });
 
-    // NodeBB events
     if (window.jQuery) {
-      try {
-        window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function(){
-          setTimeout(function(){ killStickyIn(document); }, 0);
-          setTimeout(function(){ killStickyIn(document); }, 250);
-          setTimeout(function(){ killStickyIn(document); }, 900);
-        });
-      } catch (e) {}
+      window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function(){
+        setTimeout(scheduleSweep, 0);
+        setTimeout(scheduleSweep, 250);
+        setTimeout(scheduleSweep, 900);
+      });
     }
+    installObservers();
   }
 
-  if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', install);
-  else install();
+  if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', init);
+  else init();
 })();
-// ===== /V13 =====
+// ===== /V14.1 =====
 

package/public/style.css

@@ -81,11 +81,7 @@
 }
 
 
-/* ===== V13 sticky-killer CSS fallback ===== */
-.nodebb-ezoic-wrap .ezads-sticky-intradiv {
-  position: static !important;
-  top: auto !important;
-  transform: none !important;
-}
-/* ===== /V13 ===== */
+/* ===== V14.1 host ===== */
+li.nodebb-ezoic-host { list-style: none; width: 100%; }
+/* ===== /V14.1 ===== */