Explorar el Código

fix calendar lag on popup

causefx hace 8 años
padre
commit
b0202d25e9
Se han modificado 2 ficheros con 19 adiciones y 2 borrados
  1. 4 0
      js/custom.js
  2. 15 2
      plugins/bower_components/calendar/dist/fullcalendar.js

+ 4 - 0
js/custom.js

@@ -1497,6 +1497,7 @@ $(document).on("click", ".openTab", function(e) {
 });
 // metadata start
 $(document).on("click", ".metadata-get", function(e) {
+    $("#preloader").fadeIn();
     var key = $(this).attr('data-key');
     var uid = $(this).attr('data-uid');
     var source = $(this).attr('data-source');
@@ -1564,6 +1565,7 @@ $(document).on("click", ".metadata-get", function(e) {
         console.error("Organizr Function: API Connection Failed");
     });
     ajaxloader();
+    $("#preloader").fadeOut();
 
 });
 // sab play/resume
@@ -1603,10 +1605,12 @@ $(document).on("click", ".showPassword", function () {
 
 // calendar popups
 $(document).on('click', "a[class*=ID-]", function(){
+    //$("#preloader").fadeIn();
     var details = $(this).attr('data-details');
     var target = $(this).attr('data-target')+'-metadata-info';
     var json = JSON.parse(details);
     $('.'+target).html(buildCalendarMetadata(json));
+    //$("#preloader").fadeOut();
     myLazyLoad.update();
 });
 /* ===== Open-Close Right Sidebar ===== */

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

@@ -6654,6 +6654,19 @@ DayGrid.mixin({
 		<div id="`+urlMeta+`" class="white-popup mfp-with-anim mfp-hide">
 	        <div class="col-md-8 col-md-offset-2 `+urlMeta+`-metadata-info"></div>
 	    </div>
+		<script>
+		$('.inline-popups').magnificPopup({
+	      removalDelay: 500, //delay removal by X to allow out-animation
+	      closeOnBgClick: true,
+	      //closeOnContentClick: true,
+	      callbacks: {
+	        beforeOpen: function() {
+	           this.st.mainClass = this.st.el.attr('data-effect');
+	        }
+	      },
+	      midClick: true // allow opening popup on middle mouse click. Always set it to true if you don't provide alternative source.
+	    });
+		</script>
 		`;
 		var detailsJSON = JSON.stringify(event.details);
 		classes.unshift('fc-day-grid-event', 'fc-h-event');
@@ -6664,8 +6677,8 @@ DayGrid.mixin({
 			if (timeText) {
 				timeHtml = '<span class="fc-time '+(htmlEscape(event.imagetype || '') || '&nbsp;')+'">' + htmlEscape(timeText) + '</span><br/>';
 			}else{
-       timeHtml = '<br/>';
-   }
+       			timeHtml = '<br/>';
+   			}
 		}
 		titleHtml =
 			'<span class="fc-title">' +