nodebb-plugin-calendar-onekite 11.2.27 → 11.2.29

package/CHANGELOG.md

@@ -1,13 +1,18 @@
+## 1.0.4
+- Fix: prevent `$ is not defined` by providing an immediate no-op global `$`/`jQuery` stub on calendar page and replacing it with real jQuery when available.
+- Fix: provide a compatibility shim for `app.alert(...)` to reduce console errors on some themes.
+
+
 # Changelog
 
-## 1.0.2
-- Calendrier : compatibilité thèmes/legacy — expose `window.$` / `window.jQuery` si absents (dependency AMD `jquery`) pour éviter l’erreur **`$ is not defined`**.
-- Calendrier : compatibilité NodeBB — shim minimal pour `app.alert(...)` (redirige vers le module `alerts`) afin d’éviter l’erreur **`app.alert is not a function`**.
-- Calendrier : évite la double initialisation (hook `action:ajaxify.end` + tick initial) qui pouvait provoquer un clignotement au chargement.
-- ACP : suppression du `require(...)` inline dans le template ACP (l’ACP script est déjà chargé via `acpScripts`) et auto-init via `ajaxify`.
+## 1.0.3
+- ACP : correction du multi-binding sur le bouton "Enregistrer" (plus de 4 popups vertes).
+- ACP : blocage de la soumission native du formulaire (plus de reload avec query params, et plus d'erreur `require is not defined`).
+- Calendrier : ajout d'un shim `$` plus robuste (attend `require`), afin d'éviter `Uncaught ReferenceError: $ is not defined` sur les retours paiement / thèmes legacy.
+- Calendrier : garde-fou anti double-initialisation pour supprimer le clignotement (double refresh) au chargement et après certaines actions.
 
 ## 1.0.1
-- Correctif : après validation d’une réservation depuis l’ACP, le lien HelloAsso (`paymentUrl`) est maintenant bien enregistré et transmis au calendrier (bouton **Payer maintenant** visible dans la modale).
+- Correctif : après validation d'une réservation depuis l’ACP, le lien HelloAsso (paymentUrl) est maintenant bien enregistré et transmis au calendrier (bouton **Payer maintenant** visible dans la modale).
 
 ## 1.0.0
 
@@ -20,7 +25,7 @@
 - Évènements : alignement de l’horloge identique aux icônes des réservations (rendu sans colonne de temps FullCalendar).
 - Création d’évènement : clic sur un jour = valeur par défaut **07:00 → 07:00** (gestion robuste de l’`end` exclusif FullCalendar).
 - Modales : correction d’un cas où, après annulation (ESC/clic extérieur), les modales ne réapparaissaient plus.
-- Nouveau : conservation du dernier mode sélectionné (**Location** / **Évènement**) même après création/annulation/refetch (persisté par utilisateur via `localStorage`).
+- **Nouveau** : conservation du dernier mode sélectionné (**Location** / **Évènement**) même après création/annulation/refetch (persisté par utilisateur via `localStorage`).
 
 ### Emails
 - Template relance : ajout du même bloc de paiement que dans pending (bouton + lien de secours).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-calendar-onekite",
-  "version": "11.2.27",
+  "version": "11.2.29",
   "description": "FullCalendar-based equipment reservation workflow with admin approval & HelloAsso payment for NodeBB",
   "main": "library.js",
   "license": "MIT",
@@ -11,4 +11,4 @@
   "nbbpm": {
     "compatibility": "^4.0.0"
   }
-}
+}

package/plugin.json

@@ -31,5 +31,5 @@
   "acpScripts": [
     "public/admin.js"
   ],
-  "version": "1.0.2"
-}
+  "version": "1.0.4"
+}

package/public/admin.js

@@ -1,5 +1,5 @@
 
-define('admin/plugins/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alerts, bootbox, hooks) {
+define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts, bootbox) {
   'use strict';
 
   // Cache of pending reservations keyed by rid so delegated click handlers
@@ -396,16 +396,45 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox', 'hooks'], functio
       }
     }
 
+    // Expose the current save handler so the ONE global click listener can
+    // always call the latest page's `doSave` (ajaxify rebuilds the DOM).
+    try {
+      window.__oneKiteAdminDoSave = doSave;
+    } catch (e) {}
+
     // Save buttons (NodeBB header/footer "Enregistrer" + floppy icon)
     // Use ONE delegated listener to avoid double submissions.
     const SAVE_SELECTOR = '#save, .save, [data-action="save"], .settings-save, .floating-save, .btn[data-action="save"]';
-    document.addEventListener('click', (ev) => {
-      const btn = ev.target && ev.target.closest && ev.target.closest(SAVE_SELECTOR);
-      if (!btn) return;
-      // Only handle clicks while we're on this plugin page
-      if (!document.getElementById('onekite-settings-form')) return;
-      doSave(ev);
-    });
+    if (!window.__oneKiteAdminSaveBound) {
+      window.__oneKiteAdminSaveBound = true;
+      document.addEventListener('click', (ev) => {
+        const btn = ev.target && ev.target.closest && ev.target.closest(SAVE_SELECTOR);
+        if (!btn) return;
+        // Only handle clicks while we're on this plugin page
+        if (!document.getElementById('onekite-settings-form')) return;
+        try {
+          ev.preventDefault();
+          ev.stopPropagation();
+        } catch (e) {}
+        // Call the latest save handler (set during init)
+        if (typeof window.__oneKiteAdminDoSave === 'function') {
+          window.__oneKiteAdminDoSave(ev);
+        }
+      }, true);
+    }
+
+    // Also prevent native form submission (which can cause a full page reload
+    // with query params, and multiple "success" toasts).
+    if (form && form.dataset && form.dataset.oneKiteSubmitBound !== '1') {
+      form.dataset.oneKiteSubmitBound = '1';
+      form.addEventListener('submit', (ev) => {
+        try {
+          ev.preventDefault();
+          ev.stopPropagation();
+        } catch (e) {}
+        doSave(ev);
+      });
+    }
 
     // Approve/refuse buttons
     const pendingWrap = document.getElementById('onekite-pending');
@@ -782,23 +811,5 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox', 'hooks'], functio
     }
   }
 
-  // Auto-init when the ACP page is rendered (ajaxify navigation).
-  function autoInit(data) {
-    try {
-      const tpl = data && data.template ? data.template.name : (window.ajaxify && window.ajaxify.data && window.ajaxify.data.template ? window.ajaxify.data.template.name : '');
-      if (tpl === 'admin/plugins/calendar-onekite') {
-        init();
-      }
-    } catch (e) {}
-  }
-
-  try {
-    if (hooks && typeof hooks.on === 'function') {
-      hooks.on('action:ajaxify.end', autoInit);
-    }
-    // Initial load fallback
-    setTimeout(() => autoInit({ template: (window.ajaxify && window.ajaxify.data && window.ajaxify.data.template) || { name: '' } }), 0);
-  } catch (e) {}
-
   return { init };
 });

package/public/client.js

@@ -1,34 +1,8 @@
 /* global FullCalendar, ajaxify */
 
-define('forum/calendar-onekite', ['jquery', 'alerts', 'bootbox', 'hooks'], function ($, alerts, bootbox, hooks) {
+define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alerts, bootbox, hooks) {
   'use strict';
 
-  // Some themes or legacy scripts still expect a global jQuery ($).
-  // Provide a safe global alias when missing.
-  try {
-    if (typeof window.$ === 'undefined' && $) window.$ = $;
-    if (typeof window.jQuery === 'undefined' && $) window.jQuery = $;
-  } catch (e) {}
-
-  // NodeBB core evolved from app.alert(...) to the alerts module.
-  // Provide a tiny compatibility shim to prevent console errors from legacy code.
-  try {
-    if (typeof window.app !== 'undefined' && window.app && typeof window.app.alert !== 'function') {
-      window.app.alert = function (data) {
-        try {
-          const type = (data && data.type) ? String(data.type) : 'info';
-          const msg = (data && (data.message || data.text)) ? String(data.message || data.text) : '';
-          if (!msg) return;
-          if (alerts && typeof alerts[type] === 'function') {
-            alerts[type](msg);
-          } else if (alerts && typeof alerts.alert === 'function') {
-            alerts.alert({ type, message: msg });
-          }
-        } catch (e) {}
-      };
-    }
-  } catch (e) {}
-
   // Ensure small UI tweaks are applied even when themes override bootstrap defaults.
   (function ensureOneKiteStyles() {
     try {
@@ -854,22 +828,20 @@ function toDatetimeLocalValue(date) {
       return;
     }
 
-    // Prevent double initialisation (ajaxify.end + initial-load tick) which can
-    // cause a visible "double refresh" flicker.
-    try {
-      if (el.dataset && el.dataset.onekiteInit === '1') {
-        return;
-      }
-      if (el.dataset) {
-        el.dataset.onekiteInit = '1';
-      }
-    } catch (e) {}
-
     if (typeof FullCalendar === 'undefined') {
       showAlert('error', 'FullCalendar non chargé');
       return;
     }
 
+	    // Guard against double initialisation (ajaxify.end + initial tick)
+	    // which can cause a visible "double refresh"/blink.
+	    if (el.dataset && el.dataset.oneKiteCalendarInited === '1') {
+	      return;
+	    }
+	    if (el.dataset) {
+	      el.dataset.oneKiteCalendarInited = '1';
+	    }
+
     const items = await loadItems();
     const caps = await loadCapabilities().catch(() => ({}));
     const canCreateSpecial = !!caps.canCreateSpecial;
@@ -1670,19 +1642,10 @@ function toDatetimeLocalValue(date) {
   }
 
   // Auto-init on /calendar when ajaxify finishes rendering.
-  // Prevent double initialisation (ajaxify.end + initial tick) which causes a visible flicker.
-  let didInit = false;
-
   function autoInit(data) {
     try {
       const tpl = data && data.template ? data.template.name : (ajaxify && ajaxify.data && ajaxify.data.template ? ajaxify.data.template.name : '');
       if (tpl === 'calendar-onekite') {
-        const el = document.querySelector('#onekite-calendar');
-        if (!el) return;
-        if (el.dataset && el.dataset.onekiteInit === '1') return;
-        if (didInit) return;
-        didInit = true;
-        try { if (el.dataset) el.dataset.onekiteInit = '1'; } catch (e) {}
         init('#onekite-calendar');
       }
     } catch (e) {}

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

@@ -179,10 +179,12 @@
   </div>
 </div>
 
-<!--
-  No inline require() here.
-  NodeBB loads this plugin's ACP script via plugin.json (acpScripts).
-  The admin module auto-initialises on ajaxify.
--->
+<script>
+  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,6 +7,65 @@
   </div>
 </div>
 
+<!--
+  Some themes/plugins still rely on a global `$` (jQuery), especially on
+  redirect/return flows (payment providers). NodeBB uses AMD modules, so
+  jQuery is not guaranteed to be on `window`.
+  We install a tiny shim that waits until `require` exists, then exposes
+  `window.$` and `window.jQuery`.
+-->
+<script>
+  (function () {
+    try {
+      // Provide an immediate global `$`/`jQuery` to avoid legacy scripts crashing
+      // before RequireJS is available. This stub is replaced with real jQuery when possible.
+      if (typeof window.$ === 'undefined') {
+        var noop = function () { return noop; };
+        noop.length = 0;
+        noop.ready = function (fn) { try { if (typeof fn === 'function') fn(); } catch (e) {} return noop; };
+        noop.on = noop.off = noop.click = noop.append = noop.prepend = noop.remove =
+          noop.addClass = noop.removeClass = noop.toggleClass = noop.attr = noop.css =
+          noop.text = noop.html = noop.val = function () { return noop; };
+        noop.ajax = function () { try { return Promise.resolve(); } catch (e) { return {}; } };
+        window.jQuery = window.$ = noop;
+      }
+
+      // NodeBB compatibility: some themes/plugins still call app.alert({...})
+      try {
+        if (window.app && typeof window.app.alert !== 'function') {
+          window.app.alert = function (opts) {
+            try {
+              if (window.alerts && typeof window.alerts.alert === 'function') {
+                return window.alerts.alert(opts);
+              }
+              var msg = (opts && (opts.message || opts.msg)) || '';
+              var type = (opts && (opts.type || opts.alertType)) || '';
+              if (type === 'success' && window.app && typeof window.app.alertSuccess === 'function') return window.app.alertSuccess(msg);
+              if (window.app && typeof window.app.alertError === 'function') return window.app.alertError(msg);
+            } catch (e) {}
+          };
+        }
+      } catch (e) {}
+
+      var tries = 0;
+      function attempt() {
+        tries += 1;
+        // If real jQuery is already present, keep it.
+        if (typeof window.$ === 'function' && window.$.fn && window.$.fn.jquery) return;
+
+        if (typeof require === 'function') {
+          require(['jquery'], function (jq) {
+            try { window.jQuery = window.$ = jq; } catch (e) {}
+          });
+          return;
+        }
+        if (tries < 200) setTimeout(attempt, 25);
+      }
+      attempt();
+    } catch (e) {}
+  })();
+</script>
+
 <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>