more

atk4 · Jan 28, 2025 · 99e11c5 · 99e11c5
1 parent e63014b
commit 99e11c5
Show file tree

Hide file tree

Showing 13 changed files with 101 additions and 84 deletions.
diff --git a/js/src/Service/accordionService.js b/js/src/Service/accordionService.js
@@ -1,7 +1,7 @@
 import $ from 'external/jquery';
 
 class AccordionService {
-    getDefaultFomanticSettings() {
+    getDefaultFomanticUiSettings() {
         return [
             {},
             {

diff --git a/js/src/Service/apiService.js b/js/src/Service/apiService.js
@@ -10,7 +10,7 @@ class ApiService {
         this.afterSuccessCallbacks = [];
     }
 
-    getDefaultFomanticSettings() {
+    getDefaultFomanticUiSettings() {
         return [
             {},
             {

diff --git a/js/src/Service/formService.js b/js/src/Service/formService.js
@@ -20,7 +20,7 @@ class FormService {
         });
     }
 
-    getDefaultFomanticSettings() {
+    getDefaultFomanticUiSettings() {
         return [
             {
                 rules: $.extend(true, {}, $.fn.form.settings.rules, {

diff --git a/js/src/Service/modalService.js b/js/src/Service/modalService.js
@@ -12,7 +12,7 @@ class ModalService {
         this.modals = [];
     }
 
-    getDefaultFomanticSettings() {
+    getDefaultFomanticUiSettings() {
         return [
             {
                 duration: 100,

diff --git a/js/src/Service/popupService.js b/js/src/Service/popupService.js
@@ -4,7 +4,7 @@ import atk from 'atk';
  * This is default setup for Fomantic-UI popup.
  */
 class PopupService {
-    getDefaultFomanticSettings() {
+    getDefaultFomanticUiSettings() {
         return [
             {},
             {

diff --git a/js/src/main.js b/js/src/main.js
@@ -1,7 +1,8 @@
 import 'core-js/stable';
 import atk from './setupAtk'; // must be the first non-vendor import
-import './setupPlugins';
 import './setupUtils';
+import './setupJqueryPlugins';
+import './setupServices';
 import './setupFomanticUi';
 
 __webpack_public_path__ = window.__atkBundlePublicPath + '/'; // eslint-disable-line no-undef, camelcase

diff --git a/js/src/setupFomanticUi.js b/js/src/setupFomanticUi.js
@@ -1,31 +1,12 @@
 import $ from 'external/jquery';
 import atk from 'atk';
-import accordionService from './Service/accordionService';
-import apiService from './Service/apiService';
-import dataService from './Service/dataService';
-import formService from './Service/formService';
-import modalService from './Service/modalService';
-import panelService from './Service/panelService';
-import popupService from './Service/popupService';
-import uploadService from './Service/uploadService';
-import vueService from './Service/vueService';
-
-atk.accordionService = accordionService;
-atk.apiService = apiService;
-atk.dataService = dataService;
-atk.formService = formService;
-atk.modalService = modalService;
-atk.panelService = panelService;
-atk.popupService = popupService;
-atk.uploadService = uploadService;
-atk.vueService = vueService;
-
-const fomanticServicesMap = {
-    api: apiService,
-    form: formService,
-    modal: modalService,
-    popup: popupService,
-    accordion: accordionService,
+
+const fomanticUiServicesMap = {
+    api: atk.apiService,
+    form: atk.formService,
+    modal: atk.modalService,
+    popup: atk.popupService,
+    accordion: atk.accordionService,
 };
 
 // setup Fomantic-UI global overrides
@@ -40,13 +21,13 @@ $.extend = $.fn.extend = new Proxy($.fn.extend, { // eslint-disable-line no-mult
             && $.isPlainObject(args[secondIndex])
         ) {
             let name = null;
-            for (const n of Object.keys(fomanticServicesMap)) {
+            for (const n of Object.keys(fomanticUiServicesMap)) {
                 if (args[secondIndex] === $.fn[n].settings) {
                     name = n;
                 }
             }
             if (name !== null) {
-                const [customSettings, forcedSettings] = fomanticServicesMap[name].getDefaultFomanticSettings();
+                const [customSettings, forcedSettings] = fomanticUiServicesMap[name].getDefaultFomanticUiSettings();
 
                 const newSettings = new Proxy($.extend(true, {}, {}, args[secondIndex], forcedSettings), {
                     set: (obj, prop, value) => {

diff --git a/js/src/setupPlugins.js → js/src/setupJqueryPlugins.js b/js/src/setupPlugins.js → js/src/setupJqueryPlugins.js
diff --git a/js/src/setupServices.js b/js/src/setupServices.js
@@ -0,0 +1,20 @@
+import atk from 'atk';
+import accordionService from './Service/accordionService';
+import apiService from './Service/apiService';
+import dataService from './Service/dataService';
+import formService from './Service/formService';
+import modalService from './Service/modalService';
+import panelService from './Service/panelService';
+import popupService from './Service/popupService';
+import uploadService from './Service/uploadService';
+import vueService from './Service/vueService';
+
+atk.accordionService = accordionService;
+atk.apiService = apiService;
+atk.dataService = dataService;
+atk.formService = formService;
+atk.modalService = modalService;
+atk.panelService = panelService;
+atk.popupService = popupService;
+atk.uploadService = uploadService;
+atk.vueService = vueService;
diff --git a/public/js/atkjs-ui.js b/public/js/atkjs-ui.js
@@ -1982,7 +1982,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var external_jquery__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(external_jquery__WEBPACK_IMPORTED_MODULE_0__);
 
 class AccordionService {
-  getDefaultFomanticSettings() {
+  getDefaultFomanticUiSettings() {
     return [{}, {
       onOpening: this.onOpening
     }];
@@ -2043,7 +2043,7 @@ class ApiService {
   constructor() {
     this.afterSuccessCallbacks = [];
   }
-  getDefaultFomanticSettings() {
+  getDefaultFomanticUiSettings() {
     return [{}, {
       // override supported via "../setupFomanticUi.js", both callbacks are always evaluated
       successTest: this.successTest,
@@ -2463,7 +2463,7 @@ class FormService {
       }
     });
   }
-  getDefaultFomanticSettings() {
+  getDefaultFomanticUiSettings() {
     return [{
       rules: external_jquery__WEBPACK_IMPORTED_MODULE_5___default().extend(true, {}, (external_jquery__WEBPACK_IMPORTED_MODULE_5___default().fn).form.settings.rules, {
         rules: {
@@ -2632,7 +2632,7 @@ class ModalService {
   constructor() {
     this.modals = [];
   }
-  getDefaultFomanticSettings() {
+  getDefaultFomanticUiSettings() {
     return [{
       duration: 100
     }, {
@@ -3233,7 +3233,7 @@ __webpack_require__.r(__webpack_exports__);
  * This is default setup for Fomantic-UI popup.
  */
 class PopupService {
-  getDefaultFomanticSettings() {
+  getDefaultFomanticUiSettings() {
     return [{}, {
       onShow: this.onShow
     }];
@@ -3636,41 +3636,14 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var external_jquery__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! external/jquery */ "external/jquery");
 /* harmony import */ var external_jquery__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(external_jquery__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var atk__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! atk */ "./src/setupAtk.js");
-/* harmony import */ var _Service_accordionService__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./Service/accordionService */ "./src/Service/accordionService.js");
-/* harmony import */ var _Service_apiService__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./Service/apiService */ "./src/Service/apiService.js");
-/* harmony import */ var _Service_dataService__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./Service/dataService */ "./src/Service/dataService.js");
-/* harmony import */ var _Service_formService__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./Service/formService */ "./src/Service/formService.js");
-/* harmony import */ var _Service_modalService__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./Service/modalService */ "./src/Service/modalService.js");
-/* harmony import */ var _Service_panelService__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./Service/panelService */ "./src/Service/panelService.js");
-/* harmony import */ var _Service_popupService__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./Service/popupService */ "./src/Service/popupService.js");
-/* harmony import */ var _Service_uploadService__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./Service/uploadService */ "./src/Service/uploadService.js");
-/* harmony import */ var _Service_vueService__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./Service/vueService */ "./src/Service/vueService.js");
 
 
-
-
-
-
-
-
-
-
-
-atk__WEBPACK_IMPORTED_MODULE_1__["default"].accordionService = _Service_accordionService__WEBPACK_IMPORTED_MODULE_2__["default"];
-atk__WEBPACK_IMPORTED_MODULE_1__["default"].apiService = _Service_apiService__WEBPACK_IMPORTED_MODULE_3__["default"];
-atk__WEBPACK_IMPORTED_MODULE_1__["default"].dataService = _Service_dataService__WEBPACK_IMPORTED_MODULE_4__["default"];
-atk__WEBPACK_IMPORTED_MODULE_1__["default"].formService = _Service_formService__WEBPACK_IMPORTED_MODULE_5__["default"];
-atk__WEBPACK_IMPORTED_MODULE_1__["default"].modalService = _Service_modalService__WEBPACK_IMPORTED_MODULE_6__["default"];
-atk__WEBPACK_IMPORTED_MODULE_1__["default"].panelService = _Service_panelService__WEBPACK_IMPORTED_MODULE_7__["default"];
-atk__WEBPACK_IMPORTED_MODULE_1__["default"].popupService = _Service_popupService__WEBPACK_IMPORTED_MODULE_8__["default"];
-atk__WEBPACK_IMPORTED_MODULE_1__["default"].uploadService = _Service_uploadService__WEBPACK_IMPORTED_MODULE_9__["default"];
-atk__WEBPACK_IMPORTED_MODULE_1__["default"].vueService = _Service_vueService__WEBPACK_IMPORTED_MODULE_10__["default"];
-const fomanticServicesMap = {
-  api: _Service_apiService__WEBPACK_IMPORTED_MODULE_3__["default"],
-  form: _Service_formService__WEBPACK_IMPORTED_MODULE_5__["default"],
-  modal: _Service_modalService__WEBPACK_IMPORTED_MODULE_6__["default"],
-  popup: _Service_popupService__WEBPACK_IMPORTED_MODULE_8__["default"],
-  accordion: _Service_accordionService__WEBPACK_IMPORTED_MODULE_2__["default"]
+const fomanticUiServicesMap = {
+  api: atk__WEBPACK_IMPORTED_MODULE_1__["default"].apiService,
+  form: atk__WEBPACK_IMPORTED_MODULE_1__["default"].formService,
+  modal: atk__WEBPACK_IMPORTED_MODULE_1__["default"].modalService,
+  popup: atk__WEBPACK_IMPORTED_MODULE_1__["default"].popupService,
+  accordion: atk__WEBPACK_IMPORTED_MODULE_1__["default"].accordionService
 };
 
 // setup Fomantic-UI global overrides
@@ -3683,13 +3656,13 @@ const fomanticServicesMap = {
     const secondIndex = args[0] === true ? 2 : 1;
     if (args.length >= (args[0] === true ? 3 : 2) && external_jquery__WEBPACK_IMPORTED_MODULE_0___default().isPlainObject(args[firstIndex]) && external_jquery__WEBPACK_IMPORTED_MODULE_0___default().isEmptyObject(args[firstIndex]) && external_jquery__WEBPACK_IMPORTED_MODULE_0___default().isPlainObject(args[secondIndex])) {
       let name = null;
-      for (const n of Object.keys(fomanticServicesMap)) {
+      for (const n of Object.keys(fomanticUiServicesMap)) {
         if (args[secondIndex] === (external_jquery__WEBPACK_IMPORTED_MODULE_0___default().fn)[n].settings) {
           name = n;
         }
       }
       if (name !== null) {
-        const [customSettings, forcedSettings] = fomanticServicesMap[name].getDefaultFomanticSettings();
+        const [customSettings, forcedSettings] = fomanticUiServicesMap[name].getDefaultFomanticUiSettings();
         const newSettings = new Proxy(external_jquery__WEBPACK_IMPORTED_MODULE_0___default().extend(true, {}, {}, args[secondIndex], forcedSettings), {
           set: (obj, prop, value) => {
             const origValue = obj[prop];
@@ -3748,10 +3721,10 @@ const fomanticServicesMap = {
 
 /***/ }),
 
-/***/ "./src/setupPlugins.js":
-/*!*****************************!*\
-  !*** ./src/setupPlugins.js ***!
-  \*****************************/
+/***/ "./src/setupJqueryPlugins.js":
+/*!***********************************!*\
+  !*** ./src/setupJqueryPlugins.js ***!
+  \***********************************/
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -3838,6 +3811,46 @@ atk__WEBPACK_IMPORTED_MODULE_1__["default"].registerPlugin('atkSidenav', _Jquery
 
 /***/ }),
 
+/***/ "./src/setupServices.js":
+/*!******************************!*\
+  !*** ./src/setupServices.js ***!
+  \******************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var atk__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! atk */ "./src/setupAtk.js");
+/* harmony import */ var _Service_accordionService__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./Service/accordionService */ "./src/Service/accordionService.js");
+/* harmony import */ var _Service_apiService__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./Service/apiService */ "./src/Service/apiService.js");
+/* harmony import */ var _Service_dataService__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./Service/dataService */ "./src/Service/dataService.js");
+/* harmony import */ var _Service_formService__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./Service/formService */ "./src/Service/formService.js");
+/* harmony import */ var _Service_modalService__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./Service/modalService */ "./src/Service/modalService.js");
+/* harmony import */ var _Service_panelService__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./Service/panelService */ "./src/Service/panelService.js");
+/* harmony import */ var _Service_popupService__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./Service/popupService */ "./src/Service/popupService.js");
+/* harmony import */ var _Service_uploadService__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./Service/uploadService */ "./src/Service/uploadService.js");
+/* harmony import */ var _Service_vueService__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./Service/vueService */ "./src/Service/vueService.js");
+
+
+
+
+
+
+
+
+
+
+atk__WEBPACK_IMPORTED_MODULE_0__["default"].accordionService = _Service_accordionService__WEBPACK_IMPORTED_MODULE_1__["default"];
+atk__WEBPACK_IMPORTED_MODULE_0__["default"].apiService = _Service_apiService__WEBPACK_IMPORTED_MODULE_2__["default"];
+atk__WEBPACK_IMPORTED_MODULE_0__["default"].dataService = _Service_dataService__WEBPACK_IMPORTED_MODULE_3__["default"];
+atk__WEBPACK_IMPORTED_MODULE_0__["default"].formService = _Service_formService__WEBPACK_IMPORTED_MODULE_4__["default"];
+atk__WEBPACK_IMPORTED_MODULE_0__["default"].modalService = _Service_modalService__WEBPACK_IMPORTED_MODULE_5__["default"];
+atk__WEBPACK_IMPORTED_MODULE_0__["default"].panelService = _Service_panelService__WEBPACK_IMPORTED_MODULE_6__["default"];
+atk__WEBPACK_IMPORTED_MODULE_0__["default"].popupService = _Service_popupService__WEBPACK_IMPORTED_MODULE_7__["default"];
+atk__WEBPACK_IMPORTED_MODULE_0__["default"].uploadService = _Service_uploadService__WEBPACK_IMPORTED_MODULE_8__["default"];
+atk__WEBPACK_IMPORTED_MODULE_0__["default"].vueService = _Service_vueService__WEBPACK_IMPORTED_MODULE_9__["default"];
+
+/***/ }),
+
 /***/ "./src/setupUtils.js":
 /*!***************************!*\
   !*** ./src/setupUtils.js ***!
@@ -46807,14 +46820,16 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var core_js_stable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! core-js/stable */ "./node_modules/core-js/stable/index.js");
 /* harmony import */ var core_js_stable__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(core_js_stable__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _setupAtk__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./setupAtk */ "./src/setupAtk.js");
-/* harmony import */ var _setupPlugins__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./setupPlugins */ "./src/setupPlugins.js");
-/* harmony import */ var _setupUtils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./setupUtils */ "./src/setupUtils.js");
-/* harmony import */ var _setupFomanticUi__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./setupFomanticUi */ "./src/setupFomanticUi.js");
+/* harmony import */ var _setupUtils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./setupUtils */ "./src/setupUtils.js");
+/* harmony import */ var _setupJqueryPlugins__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./setupJqueryPlugins */ "./src/setupJqueryPlugins.js");
+/* harmony import */ var _setupServices__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./setupServices */ "./src/setupServices.js");
+/* harmony import */ var _setupFomanticUi__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./setupFomanticUi */ "./src/setupFomanticUi.js");
 
  // must be the first non-vendor import
 
 
 
+
 __webpack_require__.p = window.__atkBundlePublicPath + '/'; // eslint-disable-line no-undef, camelcase
 
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (_setupAtk__WEBPACK_IMPORTED_MODULE_1__["default"]); // eslint-disable-line unicorn/prefer-export-from

diff --git a/public/js/atkjs-ui.js.map b/public/js/atkjs-ui.js.map
diff --git a/public/js/atkjs-ui.min.js b/public/js/atkjs-ui.min.js
diff --git a/public/js/atkjs-ui.min.js.map b/public/js/atkjs-ui.min.js.map