nodebb-plugin-calendar-onekite 11.2.31 → 11.2.38

package/CHANGELOG.md

@@ -1,4 +1,9 @@
 
+## 1.0.2
+- Front : empêche la double initialisation du calendrier (évite le clignotement au chargement / après actions).
+- ACP (NodeBB v4) : init robuste via `hooks.on('action:ajaxify.end')` + garde-fou anti double-bind (évite les multi-popups).
+- Maintenance : suppression du mapping module ACP legacy (`../admin/plugins/...`).
+
 ## 1.0.1.1
 - ACP (NodeBB v4) : empêche l’affichage multiple des popups de succès lors de l’enregistrement (déduplication des alerts).
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-calendar-onekite",
-  "version": "11.2.31",
+  "version": "11.2.38",
   "description": "FullCalendar-based equipment reservation workflow with admin approval & HelloAsso payment for NodeBB",
   "main": "library.js",
   "license": "MIT",

package/plugin.json

@@ -22,7 +22,6 @@
   },
   "templates": "./templates",
   "modules": {
-    "../admin/plugins/calendar-onekite.js": "./public/admin.js",
     "admin/plugins/calendar-onekite": "./public/admin.js"
   },
   "scripts": [
@@ -31,5 +30,5 @@
   "acpScripts": [
     "public/admin.js"
   ],
-  "version": "1.0.1.1"
+  "version": "1.0.2"
 }

package/public/admin.js

@@ -1,5 +1,5 @@
 
-define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts, bootbox) {
+define('admin/plugins/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alerts, bootbox, hooks) {
   'use strict';
 
   // Cache of pending reservations keyed by rid so delegated click handlers
@@ -91,7 +91,7 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
           const link = document.createElement('link');
           link.id = cssId;
           link.rel = 'stylesheet';
-          link.href = 'https://unpkg.com/leaflet@1.9.4/dist/leaflet.css';
+          link.href = 'https://cdn.jsdelivr.net/npm/leaflet@latest/dist/leaflet.css';
           document.head.appendChild(link);
         }
         const existing = document.getElementById(jsId);
@@ -103,7 +103,7 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
         const script = document.createElement('script');
         script.id = jsId;
         script.async = true;
-        script.src = 'https://unpkg.com/leaflet@1.9.4/dist/leaflet.js';
+        script.src = 'https://cdn.jsdelivr.net/npm/leaflet@latest/dist/leaflet.js';
         script.onload = () => resolve(window.L);
         script.onerror = () => reject(new Error('leaflet-load-failed'));
         document.head.appendChild(script);
@@ -335,6 +335,12 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
     const form = document.getElementById('onekite-settings-form');
     if (!form) return;
 
+    // Avoid duplicate listeners/toasts when revisiting the ACP page via ajaxify.
+    if (form.getAttribute('data-onekite-bound') === '1') {
+      return;
+    }
+    form.setAttribute('data-onekite-bound', '1');
+
     // Make the HelloAsso debug output readable in both light and dark ACP themes.
     // NodeBB 4.x uses Bootstrap variables, so we can rely on CSS variables here.
     (function injectAdminCss() {
@@ -801,5 +807,20 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
     }
   }
 
+  // Auto-init when navigating in ACP via ajaxify.
+  try {
+    const autoInit = function (data) {
+      const tpl = data && data.template ? data.template.name : (window.ajaxify && ajaxify.data && ajaxify.data.template ? ajaxify.data.template.name : '');
+      if (tpl === 'admin/plugins/calendar-onekite') {
+        init();
+      }
+    };
+    if (hooks && typeof hooks.on === 'function') {
+      hooks.on('action:ajaxify.end', autoInit);
+    }
+    // Also try once for the initial render.
+    setTimeout(() => autoInit({ template: (window.ajaxify && ajaxify.data && ajaxify.data.template) || { name: '' } }), 0);
+  } catch (e) {}
+
   return { init };
 });

package/public/client.js

@@ -456,7 +456,7 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
           const link = document.createElement('link');
           link.id = cssId;
           link.rel = 'stylesheet';
-          link.href = 'https://unpkg.com/leaflet@1.9.4/dist/leaflet.css';
+          link.href = 'https://cdn.jsdelivr.net/npm/leaflet@latest/dist/leaflet.css';
           document.head.appendChild(link);
         }
 
@@ -470,7 +470,7 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
         const script = document.createElement('script');
         script.id = jsId;
         script.async = true;
-        script.src = 'https://unpkg.com/leaflet@1.9.4/dist/leaflet.js';
+        script.src = 'https://cdn.jsdelivr.net/npm/leaflet@latest/dist/leaflet.js';
         script.onload = () => resolve(window.L);
         script.onerror = () => reject(new Error('leaflet-load-failed'));
         document.head.appendChild(script);
@@ -828,6 +828,12 @@ function toDatetimeLocalValue(date) {
       return;
     }
 
+    // Avoid double init (ajaxify + initial load tick).
+    if (el.getAttribute('data-onekite-initialised') === '1') {
+      return;
+    }
+    el.setAttribute('data-onekite-initialised', '1');
+
     if (typeof FullCalendar === 'undefined') {
       showAlert('error', 'FullCalendar non chargé');
       return;

package/templates/admin/plugins/calendar-onekite.tpl

@@ -180,11 +180,14 @@
 </div>
 
 <script>
-  require(['admin/plugins/calendar-onekite'], function (mod) {
-    if (mod && mod.init) {
-      mod.init();
-    }
-  });
+  // NodeBB v4: prefer auto-init via ajaxify hook, but keep a safe fallback.
+  if (window.require) {
+    require(['admin/plugins/calendar-onekite'], function (mod) {
+      if (mod && mod.init) {
+        mod.init();
+      }
+    });
+  }
 </script>
 
 <!-- IMPORT admin/partials/settings/footer.tpl -->

package/templates/calendar-onekite.tpl

@@ -7,9 +7,9 @@
   </div>
 </div>
 
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/fullcalendar@6.1.11/index.global.min.css" />
-<script src="https://cdn.jsdelivr.net/npm/fullcalendar@6.1.11/index.global.min.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/@fullcalendar/core@6.1.11/locales-all.global.min.js"></script>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/fullcalendar@latest/index.global.min.css" />
+<script src="https://cdn.jsdelivr.net/npm/fullcalendar@latest/index.global.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/fullcalendar@latest/locales-all.global.min.js"></script>
 
 <!--
   No inline require() here.