nodebb-plugin-ezoic-infinite 1.6.14 → 1.6.16

package/package.json

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

package/public/client.js

@@ -1,133 +1,6 @@
 (function () {
   'use strict';
 
-function ezoicAnchorKeyFromNode(node) {
-  // Robustly extract an anchor id from a <li> topic or any descendant.
-  try {
-    if (!node) return '';
-    var el = node;
-    // If node itself doesn't have ids, search descendants.
-    if (!(el.getAttribute && (el.getAttribute('data-tid') || el.getAttribute('data-topic-id') || el.getAttribute('data-pid') || el.getAttribute('data-id')))) {
-      if (el.querySelector) {
-        el = el.querySelector('[data-tid],[data-topic-id],[data-pid],[data-id]') || node;
-      }
-    }
-    if (el.getAttribute) {
-      var tid = el.getAttribute('data-tid') || el.getAttribute('data-topic-id');
-      if (tid) return 'tid:' + String(tid);
-      var pid = el.getAttribute('data-pid') || el.getAttribute('data-id');
-      if (pid) return 'pid:' + String(pid);
-    }
-  } catch (e) {}
-  return '';
-}
-
-function ezoicFindAnchorLi(anchorKey, listEl) {
-  try {
-    if (!anchorKey) return null;
-    var root = listEl || document;
-    var el = null;
-    if (anchorKey.indexOf('tid:') === 0) {
-      var v = anchorKey.slice(4);
-      el = root.querySelector('[data-tid="' + v + '"], [data-topic-id="' + v + '"]');
-    } else if (anchorKey.indexOf('pid:') === 0) {
-      var p = anchorKey.slice(4);
-      el = root.querySelector('[data-pid="' + p + '"], [data-id="' + p + '"]');
-    }
-    if (!el) return null;
-    return el.closest ? (el.closest('li') || null) : null;
-  } catch (e) { return null; }
-}
-
-function ezoicReconcileOrPurgeHosts(scope) {
-  // Reposition each host after its anchor li. If anchor doesn't exist (virtualized away),
-  // remove the host to prevent it from collecting at the top.
-  try {
-    var root = scope || document;
-    var hosts = root.querySelectorAll('li.nodebb-ezoic-host[data-ezoic-anchor]');
-    if (!hosts || !hosts.length) return;
-
-    hosts.forEach(function(host){
-      try {
-        var listEl = host.parentElement;
-        if (!listEl) return;
-        var anchorKey = host.getAttribute('data-ezoic-anchor') || '';
-        if (!anchorKey) return;
-
-        var anchorLi = ezoicFindAnchorLi(anchorKey, listEl) || ezoicFindAnchorLi(anchorKey, document);
-        if (!anchorLi) {
-          // Anchor not in DOM right now => delete host to avoid "pile at top"
-          host.remove();
-          return;
-        }
-        if (host.previousElementSibling !== anchorLi) {
-          anchorLi.insertAdjacentElement('afterend', host);
-        }
-      } catch (e) {}
-    });
-  } catch (e) {}
-}
-
-
-function ezoicInsertAfterWithUlGuard(target, wrap, kindClass) {
-  try {
-    if (!target || !wrap) return;
-    // Only guard for BETWEEN placements (known to be inserted between <li> items inside <ul>/<ol>)
-    if (kindClass === 'ezoic-ad-between') {
-      var p = target.parentElement;
-      if (p && (p.tagName === 'UL' || p.tagName === 'OL')) {
-        // Ensure wrap is not a direct child of UL/OL (invalid HTML); wrap it in an LI host.
-        var host = document.createElement('li');
-        host.className = 'nodebb-ezoic-host';
-        host.setAttribute('role', 'listitem');
-        host.style.listStyle = 'none';
-        host.style.width = '100%';
-        try { var prev = wrap.previousElementSibling; var ak2 = ezoicAnchorKeyFromNode(prev || (wrap.parentElement && wrap.parentElement.previousElementSibling)); if (ak2) host.setAttribute('data-ezoic-anchor', ak2); } catch(e) {}
-        try { var ak = ezoicAnchorKeyFromNode(target); if (ak) host.setAttribute('data-ezoic-anchor', ak); } catch(e) {}
-
-        // Insert host after the target listitem, then move the wrap inside.
-        if (target.insertAdjacentElement) {
-          target.insertAdjacentElement('afterend', host);
-        } else if (p.insertBefore) {
-          p.insertBefore(host, target.nextSibling);
-        }
-        try { host.appendChild(wrap); } catch (e) {}
-
-        // Keep wrap full width
-        try { wrap.style.width = '100%'; } catch (e) {}
-        return;
-      }
-    }
-
-    // Default behavior
-    if (target.insertAdjacentElement) ezoicInsertAfterWithUlGuard(target, wrap, kindClass);
-    else if (target.parentNode) target.parentNode.insertBefore(wrap, target.nextSibling);
-  } catch (e) {}
-}
-
-function ezoicRepairInvalidBetweenWraps() {
-  // If any legacy DIV wraps were already inserted directly under UL/OL, repair them once.
-  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 p = wrap.parentElement;
-        if (!p) return;
-        var host = document.createElement('li');
-        host.className = 'nodebb-ezoic-host';
-        host.setAttribute('role', 'listitem');
-        host.style.listStyle = 'none';
-        host.style.width = '100%';
-        try { var ak = ezoicAnchorKeyFromNode(target); if (ak) host.setAttribute('data-ezoic-anchor', ak); } catch(e) {}
-        p.insertBefore(host, wrap);
-        host.appendChild(wrap);
-        try { wrap.style.width = '100%'; } catch (e) {}
-      } catch (e) {}
-    });
-  } catch (e) {}
-}
-
-
   // Track scroll direction to avoid aggressive recycling when the user scrolls upward.
   // Recycling while scrolling up is a common cause of ads "bunching" and a "disappearing too fast" feeling.
   let lastScrollY = 0;
@@ -795,7 +668,7 @@ function globalGapFixInit() {
     insertingIds.add(id);
     try {
       const wrap = buildWrap(id, kindClass, afterPos, !existingPh);
-      ezoicInsertAfterWithUlGuard(target, wrap, kindClass);
+      target.insertAdjacentElement('afterend', wrap);
 
       // If placeholder exists elsewhere (including pool), move it into the wrapper.
       if (existingPh) {
@@ -1287,7 +1160,7 @@ function buildOrdinalMap(items) {
       if (!anchorEl || !wrap || !wrap.isConnected) return null;
 
       wrap.setAttribute('data-ezoic-after', String(afterPos));
-      ezoicInsertAfterWithUlGuard(anchorEl, wrap, kindClass);
+      anchorEl.insertAdjacentElement('afterend', wrap);
 
       // Ensure minimal layout impact.
       try { wrap.style.contain = 'layout style paint'; } catch (e) {}
@@ -1637,62 +1510,104 @@ function buildOrdinalMap(items) {
 })();
 
 
-// ===== V12.2: run UL/OL repair =====
-try { ezoicRepairInvalidBetweenWraps(); } catch (e) {}
-if (window.jQuery) {
-  try {
-    window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function () {
-      setTimeout(function(){ try { ezoicRepairInvalidBetweenWraps(); } catch(e) {} }, 0);
-      setTimeout(function(){ try { ezoicRepairInvalidBetweenWraps(); } catch(e) {} }, 200);
-    });
-  } catch (e) {}
-}
-// ===== /V12.2 =====
-
-
-// ===== V12.4 reconcile+purge scheduler =====
-(function(){
-  var pending=false, last=0, COOLDOWN=160;
-  function schedule(scope){
-    var now=Date.now();
-    if (now-last<COOLDOWN) return;
-    if (pending) return;
-    pending=true;
-    requestAnimationFrame(function(){
-      pending=false; last=Date.now();
-      try { ezoicReconcileOrPurgeHosts(scope); } catch(e) {}
-    });
-  }
-
-  window.addEventListener('scroll', function(){ schedule(document); }, { passive:true });
-  window.addEventListener('resize', function(){ schedule(document); }, { passive:true });
 
-  if (window.jQuery) {
-    window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function(){
-      setTimeout(function(){ schedule(document); }, 0);
-      setTimeout(function(){ schedule(document); }, 220);
-      setTimeout(function(){ schedule(document); }, 700);
-    });
-  }
+// ===== V13 sticky-killer for Ezoic/AMP in list ads =====
+(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.
 
-  // Observe only the main list containers if present to reduce overhead
-  try {
-    if (typeof MutationObserver !== 'undefined') {
-      var mo = new MutationObserver(function(muts){
-        for (var i=0;i<muts.length;i++){
-          var m=muts[i];
-          if ((m.addedNodes && m.addedNodes.length) || (m.removedNodes && m.removedNodes.length)) {
-            schedule(m.target);
-            break;
+  function killStickyIn(root) {
+    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)
+        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);
           }
-        }
-      });
-      document.querySelectorAll('ul[component], ul.topic-list, ul.categories, ol[component]').forEach(function(list){
-        try { mo.observe(list, {childList:true}); } catch(e) {}
+        } 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 });
+
+    // MutationObserver to catch late injections / style changes
+    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']
+        });
+      }
+    } catch (e) {}
+
+    // 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) {}
     }
-  } catch(e){}
+  }
 
-  setTimeout(function(){ schedule(document); }, 0);
+  if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', install);
+  else install();
 })();
-// ===== /V12.4 =====
+// ===== /V13 =====
+

package/public/style.css

@@ -81,8 +81,11 @@
 }
 
 
-/* ===== V12.2 UL host for between wraps ===== */
-li.nodebb-ezoic-host { list-style: none; width: 100%; }
-li.nodebb-ezoic-host > .nodebb-ezoic-wrap { width: 100%; }
-/* ===== /V12.2 ===== */
+/* ===== V13 sticky-killer CSS fallback ===== */
+.nodebb-ezoic-wrap .ezads-sticky-intradiv {
+  position: static !important;
+  top: auto !important;
+  transform: none !important;
+}
+/* ===== /V13 ===== */