Преглед изворни кода

fix calendar double today button
fix calendar scroll

causefx пре 8 година
родитељ
комит
20fb745fc5
2 измењених фајлова са 6 додато и 4 уклоњено
  1. 4 4
      api/pages/homepage.php
  2. 2 0
      plugins/bower_components/calendar/dist/fullcalendar.js

+ 4 - 4
api/pages/homepage.php

@@ -33,12 +33,12 @@ if (file_exists('config' . DIRECTORY_SEPARATOR . 'config.php')) {
             header: {
                left: "prev,next,today",
                center: "title",
-               right: (activeInfo.mobile) ? "" : "today,month,basicWeek,basicDay,list",
+               right: (activeInfo.mobile) ? "" : "month,basicWeek,basicDay,list",
             },
             views: {
-               basicDay: { buttonText: window.lang.translate("Day"), eventLimit: '.$GLOBALS['calendarLimit'].' },
-               basicWeek: { buttonText: window.lang.translate("Week"), eventLimit: '.$GLOBALS['calendarLimit'].' },
-               month: { buttonText: window.lang.translate("Month"), eventLimit: '.$GLOBALS['calendarLimit'].' },
+               basicDay: { buttonText: window.lang.translate("Day"), eventLimit: ' . $GLOBALS['calendarLimit'] . ' },
+               basicWeek: { buttonText: window.lang.translate("Week"), eventLimit: ' . $GLOBALS['calendarLimit'] . ' },
+               month: { buttonText: window.lang.translate("Month"), eventLimit: ' . $GLOBALS['calendarLimit'] . ' },
                list: { buttonText: window.lang.translate("List"), duration: {days: 15} },
             },
             timezone: "local",

+ 2 - 0
plugins/bower_components/calendar/dist/fullcalendar.js

@@ -11214,12 +11214,14 @@ function Calendar_constructor(element, overrides) {
 	function prev() {
 		date = currentView.computePrevDate(date);
 		renderView();
+        new SimpleBar($('.fc-scroller')[0]);
 	}
 
 
 	function next() {
 		date = currentView.computeNextDate(date);
 		renderView();
+        new SimpleBar($('.fc-scroller')[0]);
 	}