nodebb-plugin-ezoic-infinite 0.5.0 → 0.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "Ezoic ads with infinite scroll using a pool of placeholder IDs",
   "main": "library.js",
   "license": "MIT",

package/plugin.json

@@ -17,10 +17,10 @@
     "public": "public"
   },
   "acpScripts": [
-    "public/admin.js"
+    "./public/admin.js"
   ],
   "scripts": [
-    "public/client.js"
+    "./public/client.js"
   ],
   "templates": "public/templates"
 }

package/public/admin.js

@@ -9,18 +9,27 @@
     require(['settings', 'alerts'], function (Settings, alerts) {
       Settings.load('ezoic-infinite', $form);
 
-      $('#save').off('click.ezoicInfinite').on('click.ezoicInfinite', function (e) {
-        e.preventDefault();
+      function doSave(e) {
+        if (e) e.preventDefault();
+        const $btn = $('#save');
+        $btn.prop('disabled', true);
 
+        // Settings.save signature differs slightly across versions; keep compatible
         Settings.save('ezoic-infinite', $form, function () {
-          // Toast vert (NodeBB core)
           if (alerts && typeof alerts.success === 'function') {
             alerts.success('Enregistré');
           } else if (window.app && typeof window.app.alertSuccess === 'function') {
             window.app.alertSuccess('Enregistré');
           }
+          $btn.prop('disabled', false);
         });
-      });
+
+        // Fallback: re-enable even if callback not fired (mobile sometimes)
+        setTimeout(function () { $btn.prop('disabled', false); }, 4000);
+      }
+
+      $form.off('submit.ezoicInfinite').on('submit.ezoicInfinite', doSave);
+      $('#save').off('click.ezoicInfinite').on('click.ezoicInfinite', doSave);
     });
   }
 

package/public/client.js

@@ -22,17 +22,16 @@ function parsePool(raw) {
   ));
 }
 
-/**
- * Harmony (topic page) selector:
- * - Posts: [component="post"]
- */
 function getTopicPosts() {
   const $p = $('[component="post"]').not('.ezoic-ad-post');
   if ($p.length) return $p;
-  // fallback
   return $('.posts .post').not('.ezoic-ad-post');
 }
 
+function isLi($el) {
+  return ($el && $el.length && (($el.prop('tagName') || '').toUpperCase() === 'LI'));
+}
+
 function removePlaceholdersByPool(pool) {
   pool.forEach(id => $('#ezoic-pub-ad-placeholder-' + id).remove());
 }
@@ -51,6 +50,36 @@ function computeWindowSlots(totalItems, interval, poolSize) {
   return out;
 }
 
+function makeBetweenWrapper($targetPost, placeholderId) {
+  if (isLi($targetPost)) {
+    return (
+      '<li class="ezoic-ad-between list-unstyled" data-ezoic-ad="1">' +
+        '<div id="ezoic-pub-ad-placeholder-' + placeholderId + '"></div>' +
+      '</li>'
+    );
+  }
+  return '<div class="ezoic-ad-between" id="ezoic-pub-ad-placeholder-' + placeholderId + '"></div>';
+}
+
+function makeAdMessageWrapper($targetPost, placeholderId) {
+  if (isLi($targetPost)) {
+    return (
+      '<li class="post ezoic-ad-post" data-ezoic-ad="1">' +
+        '<div class="content">' +
+          '<div id="ezoic-pub-ad-placeholder-' + placeholderId + '"></div>' +
+        '</div>' +
+      '</li>'
+    );
+  }
+  return (
+    '<div class="post ezoic-ad-post" data-ezoic-ad="1">' +
+      '<div class="content">' +
+        '<div id="ezoic-pub-ad-placeholder-' + placeholderId + '"></div>' +
+      '</div>' +
+    '</div>'
+  );
+}
+
 function insertBetweenPosts($posts, pool, interval) {
   const total = $posts.length;
   const slotsToRender = computeWindowSlots(total, interval, pool.length);
@@ -64,7 +93,7 @@ function insertBetweenPosts($posts, pool, interval) {
     const $target = $posts.eq(index);
     if (!$target.length) continue;
 
-    $target.after('<div class="ezoic-ad-between" id="ezoic-pub-ad-placeholder-' + id + '"></div>');
+    $target.after(makeBetweenWrapper($target, id));
     activeIds.push(id);
   }
   return activeIds;
@@ -83,21 +112,19 @@ function insertAdMessagesBetweenReplies($posts, pool, interval) {
     const $target = $posts.eq(index);
     if (!$target.length) continue;
 
-    const html =
-      '<div class="post ezoic-ad-post" data-ezoic-ad="1">' +
-        '<div class="content">' +
-          '<div id="ezoic-pub-ad-placeholder-' + id + '"></div>' +
-        '</div>' +
-      '</div>';
-
-    $target.after(html);
+    $target.after(makeAdMessageWrapper($target, id));
     activeIds.push(id);
   }
   return activeIds;
 }
 
 async function refreshAds() {
-  const cfg = await fetchConfig();
+  let cfg;
+  try {
+    cfg = await fetchConfig();
+  } catch (e) {
+    return;
+  }
   if (!cfg || cfg.excluded) return;
 
   const betweenPool = parsePool(cfg.placeholderIds);
@@ -107,26 +134,22 @@ async function refreshAds() {
   const messageInterval = Math.max(1, parseInt(cfg.messageIntervalPosts, 10) || 3);
 
   const $posts = getTopicPosts();
-  if (!$posts.length) return; // only topic pages
+  if (!$posts.length) return;
 
-  // Clean first
   removeAdWrappers();
   removePlaceholdersByPool(betweenPool);
   removePlaceholdersByPool(messagePool);
 
   const activeIds = [];
 
-  // Between posts
   if (cfg.enableBetweenAds && betweenPool.length) {
     activeIds.push(...insertBetweenPosts($posts, betweenPool, betweenInterval));
   }
 
-  // "Ad message" between replies
   if (cfg.enableMessageAds && messagePool.length) {
     activeIds.push(...insertAdMessagesBetweenReplies($posts, messagePool, messageInterval));
   }
 
-  // Ezoic render
   if (activeIds.length && window.ezstandalone && typeof window.ezstandalone.destroyPlaceholders === 'function') {
     try { window.ezstandalone.destroyPlaceholders(); } catch (e) {}
   }
@@ -137,8 +160,9 @@ async function refreshAds() {
 
 function debounceRefresh() {
   clearTimeout(debounceTimer);
-  debounceTimer = setTimeout(refreshAds, 100);
+  debounceTimer = setTimeout(refreshAds, 120);
 }
 
+$(document).ready(debounceRefresh);
 $(window).on('action:ajaxify.end action:posts.loaded action:topic.loaded', debounceRefresh);
-setTimeout(debounceRefresh, 800);
+setTimeout(debounceRefresh, 1200);

package/public/templates/admin/plugins/ezoic-infinite.tpl

@@ -54,6 +54,6 @@
       <p class="form-text">Si l’utilisateur appartient à un de ces groupes, aucune pub n’est injectée.</p>
     </div>
 
-    <button id="save" class="btn btn-primary">Enregistrer</button>
+    <button id="save" type="submit" class="btn btn-primary">Enregistrer</button>
   </form>
 </div>