[TikiWiki-commits] [Git][tikiwiki/tiki][28.x] [FIX] Fix the module and wikiplugin calendar so it doesn't remain stuck on...

franck franck kalunga pushed to branch 28.x at Tiki Wiki CMS Groupware / Tiki


Commits:
178e60bd by franck franck kalunga at 2025-10-17T15:21:04+00:00
[FIX] Fix the module and wikiplugin calendar so it doesn't remain stuck on...
---
* [FIX] Fix the module and wikiplugin calendar so it doesn't remain stuck on loading when the date is updated

See merge request tikiwiki/tiki!8805

- - - - -


3 changed files:

- src/js/jquery-tiki/tiki-calendar.js
- templates/modules/mod-calendar_new.tpl
- templates/wiki-plugins/wikiplugin_calendar.tpl


Changes:

=====================================
src/js/jquery-tiki/tiki-calendar.js
=====================================
@@ -106,6 +106,7 @@ $.fn.setupFullCalendar = function (
                 return event;
             },
             eventDidMount: function (arg) {
+                $(calendarEl).tikiModal();
                 const event = arg.event;
                 const element = $(arg.el);
                 const dayGrid = $(".fc-daygrid-event").length;


=====================================
templates/modules/mod-calendar_new.tpl
=====================================
@@ -21,12 +21,12 @@
 
                 {if $viewlist neq 'list'}
                     {jq}
-                        let paramOfModuleCalendar = {{$eventCalendarParams|json_encode}};
+                        let paramOfModuleCalendar = {{$fullCalendarParams|json_encode}};
                         const moduleCalendarFocusDate = document.getElementById('date-module-calendar');
                         paramOfModuleCalendar['initialDate'] = $('#date-module-calendar').val();
 
                         const calendarContainer = [window.moduleCalendar];
-                        $("#module-calendar").setupFullCalendar({{$eventCalendarParams|json_encode}}, calendarContainer, 'module-calendar', 'tiki-ajax_services.php?controller=calendar&action=list_items&calIds={{$moduleCalendarIds}}');
+                        $("#module-calendar").setupFullCalendar(paramOfModuleCalendar, calendarContainer, 'module-calendar', 'tiki-ajax_services.php?controller=calendar&action=list_items&calIds={{$moduleCalendarIds}}');
                         moduleCalendarFocusDate.addEventListener('change', () => {
                             document.getElementById('module-calendar').innerHTML = "";
                             paramOfModuleCalendar['initialDate'] = $('#date-module-calendar').val();


=====================================
templates/wiki-plugins/wikiplugin_calendar.tpl
=====================================
@@ -8,7 +8,7 @@
 
     {if $viewlist neq 'list'}
         {jq}
-            let content = {{$eventCalendarParams|json_encode}};
+            let content = {{$fullCalendarParams|json_encode}};
             const elt = document.getElementById('date-plugin-calendar');
             content['initialDate'] = $('#date-plugin-calendar').val();
             const wikipluginCalendar = [window.pluginCalendar]



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/178e60bdef5230a6f1a31034f89e30393b3a7e01

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/178e60bdef5230a6f1a31034f89e30393b3a7e01
You're receiving this email because of your account on gitlab.com.

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs