nodebb-plugin-equipment-calendar 10.0.0 → 10.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-equipment-calendar",
-  "version": "10.0.0",
+  "version": "10.0.2",
   "main": "library.js",
   "license": "MIT"
 }

package/public/js/admin.js

@@ -1,97 +1,79 @@
 'use strict';
-/* globals ajaxify, socket, app */
+/* globals ajaxify, app, socket, require, $ */
 
+// Official NodeBB ACP pattern uses the Settings module (AMD) + jQuery events.
 (function () {
   const HASH = 'equipmentCalendar';
 
-  function isOnPage() {
+  function onPage() {
     try {
-      const url = (ajaxify && ajaxify.data && ajaxify.data.url) ? ajaxify.data.url : '';
-      return url.startsWith('admin/plugins/equipment-calendar');
-    } catch (e) { return false; }
-  }
-
-  function rootEl() {
-    return document.querySelector('.equipment-calendar-settings');
-  }
-
-  function fields() {
-    return Array.from(document.querySelectorAll('.equipment-calendar-settings [data-field]'));
-  }
-
-  function setValues(values) {
-    const map = values || {};
-    fields().forEach((el) => {
-      const key = el.getAttribute('data-field');
-      let val = map[key];
-      if (val === undefined || val === null) val = '';
-      el.value = String(val);
-    });
+      const url = (ajaxify && ajaxify.data && typeof ajaxify.data.url === 'string') ? ajaxify.data.url : '';
+      return url === 'admin/plugins/equipment-calendar' || url === '/admin/plugins/equipment-calendar' ||
+        url.startsWith('admin/plugins/equipment-calendar?') || url.startsWith('/admin/plugins/equipment-calendar?');
+    } catch (e) {
+      return false;
+    }
   }
 
-  function getValues() {
-    const out = {};
-    fields().forEach((el) => {
-      const key = el.getAttribute('data-field');
-      out[key] = el.value;
-    });
-    return out;
-  }
+  function init() {
+    if (!onPage()) return;
+    const $container = $('.equipment-calendar-settings');
+    if (!$container.length) return;
 
-  function alertSuccess(msg) {
-    if (window.app && typeof app.alertSuccess === 'function') return app.alertSuccess(msg);
-    console.log('[success]', msg);
-  }
-  function alertError(msg) {
-    if (window.app && typeof app.alertError === 'function') return app.alertError(msg);
-    console.error('[error]', msg);
-  }
+    // Prefer Settings module when available (official behaviour)
+    if (typeof require === 'function') {
+      require(['settings'], function (Settings) {
+        Settings.load(HASH, $container);
 
-  function socketEmit(name, payload) {
-    return new Promise((resolve, reject) => {
-      if (!window.socket) return reject(new Error('socket not available'));
-      socket.emit(name, payload, (err, data) => {
-        if (err) return reject(err);
-        resolve(data);
+        $('#ec-save').off('click.ec').on('click.ec', function () {
+          Settings.save(HASH, $container, function () {
+            if (app && app.alertSuccess) {
+              app.alertSuccess('[[admin/settings:settings-saved]]');
+            }
+          });
+        });
       });
-    });
-  }
-
-  async function load() {
-    const data = await socketEmit('admin.settings.get', { hash: HASH });
-    const values = (data && (data.values || data)) || {};
-    setValues(values);
-  }
-
-  async function save() {
-    const values = getValues();
-    await socketEmit('admin.settings.save', { hash: HASH, values });
-  }
+      return;
+    }
 
-  async function init() {
-    if (!isOnPage()) return;
-    if (!rootEl()) return;
+    // Fallback: raw socket calls (in case require is unavailable)
+    const fields = $container.find('[data-field]');
+    function getValues() {
+      const values = {};
+      fields.each(function () {
+        const $el = $(this);
+        values[$el.attr('data-field')] = $el.val();
+      });
+      return values;
+    }
+    function setValues(values) {
+      values = values || {};
+      fields.each(function () {
+        const $el = $(this);
+        const key = $el.attr('data-field');
+        $el.val(values[key] || '');
+      });
+    }
 
-    try { await load(); } catch (e) {}
+    socket.emit('admin.settings.get', { hash: HASH }, function (err, data) {
+      if (err) return;
+      setValues((data && (data.values || data)) || {});
+    });
 
-    const btn = document.getElementById('ec-save');
-    if (btn && !btn.__bound) {
-      btn.__bound = true;
-      btn.addEventListener('click', async (e) => {
-        e.preventDefault();
-        try {
-          await save();
-          alertSuccess('[[admin/settings:settings-saved]]');
-        } catch (err) {
-          alertError(err && err.message ? err.message : String(err));
+    $('#ec-save').off('click.ec').on('click.ec', function () {
+      socket.emit('admin.settings.save', { hash: HASH, values: getValues() }, function (err) {
+        if (err) {
+          app && app.alertError && app.alertError(err.message || String(err));
+          return;
         }
+        app && app.alertSuccess && app.alertSuccess('[[admin/settings:settings-saved]]');
       });
-    }
+    });
   }
 
-  if (window.jQuery) {
-    window.jQuery(window).on('action:ajaxify.end', init);
-  } else {
-    window.addEventListener('load', init);
-  }
+  // Official NodeBB event binding (see NodeBB hooks docs)
+  $(window).off('action:ajaxify.end.ec').on('action:ajaxify.end.ec', init);
+
+  // Run once in case the page is already loaded
+  $(init);
 })();