nodebb-plugin-ezoic-infinite 1.6.14 → 1.6.15

package/package.json

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

package/public/client.js

@@ -1,47 +1,49 @@
 (function () {
   'use strict';
 
-function ezoicAnchorKeyFromNode(node) {
-  // Robustly extract an anchor id from a <li> topic or any descendant.
+function ezoicTopicIdFromLi(li) {
   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);
-    }
+    if (!li) return '';
+    // try explicit attrs first
+    var tid = li.getAttribute && (li.getAttribute('data-tid') || li.getAttribute('data-topic-id'));
+    if (tid) return String(tid);
+    // try finding a topic permalink like /topic/13789/...
+    var a = li.querySelector && li.querySelector('a[href*="/topic/"]');
+    if (!a) return '';
+    var href = a.getAttribute('href') || '';
+    var m = href.match(/\/topic\/(\d+)\b/);
+    if (m && m[1]) return m[1];
   } catch (e) {}
   return '';
 }
 
-function ezoicFindAnchorLi(anchorKey, listEl) {
+function ezoicAnchorKeyFromTarget(target) {
+  try {
+    if (!target) return '';
+    var li = target.closest ? target.closest('li') : null;
+    if (!li) li = target.tagName === 'LI' ? target : null;
+    if (!li) return '';
+    var tid = ezoicTopicIdFromLi(li);
+    if (tid) return 'topic:' + tid;
+  } catch (e) {}
+  return '';
+}
+
+function ezoicFindAnchorLiByKey(anchorKey, scope) {
   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; }
+    if (anchorKey.indexOf('topic:') !== 0) return null;
+    var tid = anchorKey.slice(6);
+    var root = scope || document;
+    // locate any link to this topic and climb to li
+    var link = root.querySelector('a[href^="/topic/' + tid + '"], a[href*="/topic/' + tid + '/"]');
+    if (!link) return null;
+    return link.closest ? link.closest('li') : 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.
+function ezoicReconcileOrPurgeByTopic(scope) {
   try {
     var root = scope || document;
     var hosts = root.querySelectorAll('li.nodebb-ezoic-host[data-ezoic-anchor]');
@@ -51,12 +53,11 @@ function ezoicReconcileOrPurgeHosts(scope) {
       try {
         var listEl = host.parentElement;
         if (!listEl) return;
-        var anchorKey = host.getAttribute('data-ezoic-anchor') || '';
-        if (!anchorKey) return;
+        var key = host.getAttribute('data-ezoic-anchor') || '';
+        if (!key) return;
 
-        var anchorLi = ezoicFindAnchorLi(anchorKey, listEl) || ezoicFindAnchorLi(anchorKey, document);
+        var anchorLi = ezoicFindAnchorLiByKey(key, listEl) || ezoicFindAnchorLiByKey(key, document);
         if (!anchorLi) {
-          // Anchor not in DOM right now => delete host to avoid "pile at top"
           host.remove();
           return;
         }
@@ -82,8 +83,7 @@ function ezoicInsertAfterWithUlGuard(target, wrap, kindClass) {
         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) {}
+        try { var ak = ezoicAnchorKeyFromTarget(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) {
@@ -118,7 +118,7 @@ function ezoicRepairInvalidBetweenWraps() {
         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) {}
+        try { var prevLi = wrap.previousElementSibling; var ak2 = ezoicAnchorKeyFromTarget(prevLi || wrap); if (ak2) host.setAttribute('data-ezoic-anchor', ak2); } catch(e) {}
         p.insertBefore(host, wrap);
         host.appendChild(wrap);
         try { wrap.style.width = '100%'; } catch (e) {}
@@ -1650,9 +1650,10 @@ if (window.jQuery) {
 // ===== /V12.2 =====
 
 
-// ===== V12.4 reconcile+purge scheduler =====
+
+// ===== V12.5 topic-anchor reconcile =====
 (function(){
-  var pending=false, last=0, COOLDOWN=160;
+  var pending=false, last=0, COOLDOWN=140;
   function schedule(scope){
     var now=Date.now();
     if (now-last<COOLDOWN) return;
@@ -1660,7 +1661,7 @@ if (window.jQuery) {
     pending=true;
     requestAnimationFrame(function(){
       pending=false; last=Date.now();
-      try { ezoicReconcileOrPurgeHosts(scope); } catch(e) {}
+      try { ezoicReconcileOrPurgeByTopic(scope); } catch(e) {}
     });
   }
 
@@ -1675,7 +1676,6 @@ if (window.jQuery) {
     });
   }
 
-  // Observe only the main list containers if present to reduce overhead
   try {
     if (typeof MutationObserver !== 'undefined') {
       var mo = new MutationObserver(function(muts){
@@ -1687,12 +1687,13 @@ if (window.jQuery) {
           }
         }
       });
-      document.querySelectorAll('ul[component], ul.topic-list, ul.categories, ol[component]').forEach(function(list){
-        try { mo.observe(list, {childList:true}); } catch(e) {}
+      document.querySelectorAll('ul,ol').forEach(function(list){
+        try { mo.observe(list, {childList:true, subtree:false}); } catch(e) {}
       });
     }
   } catch(e){}
 
   setTimeout(function(){ schedule(document); }, 0);
 })();
-// ===== /V12.4 =====
+// ===== /V12.5 =====
+