testing flicker reduction when switching between agenda and calendar view for the...

diff --git a/css/front.css b/css/front.css
index 81e4c0a..8dfad06 100644 (file)
--- a/css/front.css
+++ b/css/front.css
@@ -1,5 +1,6 @@
 #glm-event-agenda-view {
     margin-top: 0px;
+    display: none;
 }
 #glm-member-event-search {
     margin-top: 20px;

diff --git a/views/front/events/agenda.html b/views/front/events/agenda.html
index 1bedfdf..e5b61f7 100644 (file)
--- a/views/front/events/agenda.html
+++ b/views/front/events/agenda.html
@@ -78,6 +78,7 @@
         var table               = 'glm-table-calendar';
         var post_start, post_end, month_obj;
         var rows                = $(".glm-event-day-row");
+        var agenda              = $("#glm-event-agenda-view");
         var view_select         = $("#glm-event-view-select");
         var search              = $("#glm-events-search-form");
         var calendar            = $("#eventCalendar");
@@ -101,7 +102,7 @@
             $('.fc-event').remove();
 
              jQuery.ajax({
-                type: 'GET',
+                type: 'POST',
                 url: '{$ajaxUrl}',
                 data: dat,
                 cache: false,
@@ -126,26 +127,6 @@
             });
             var timestamp = $.now();
             var url = '{$ajaxUrl}' + '?t=' + timestamp;
-            /*
-            jQuery.post(url, dat, function (response){
-                var buildingEvents = [];
-//                    var events_obj = jQuery.parseJSON(response);
-                    var events_obj = response;
-                    var events = events_obj.events;
-
-                    buildingEvents = $.map(events, function(i, val) {
-                        return {
-                            title:   i.title,
-                            start:   i.start,
-                            end:     i.last,
-                            allDay:  i.all_day,
-                            url:     i.url
-                        };
-                    });
-                    $("#eventCalendar").fullCalendar('removeEvents');
-                    $("#eventCalendar").fullCalendar('addEventSource', buildingEvents);
-            });
-            */
         }
         var height = 900;
         // Calendar *****************************************************
@@ -191,12 +172,11 @@
             eventsCalMonthAJAX(month_obj);
             main_content.removeClass("small-8").addClass("small-12");
             calendar.show();
-            rows.hide();
             view_select.val('calendar');
 
         } else if ( view === "agenda"){
             calendar.hide();
-            rows.show();
+            agenda.css("display", "block");
             view_select.val('agenda');
         }
         $("#glm-event-view-select").on("change", function (){
@@ -204,12 +184,12 @@
             sessionStorage.setItem("view", $(this).attr("value"));
             if($("#glm-event-view-select option:selected").val() === "calendar"){
                 eventsCalMonthAJAX(month_obj);
-                rows.fadeOut('slow', function(){});
+                agenda.css("display","none");
                 calendar.fadeIn('slow', function(){});
                 calendar.fullCalendar('render');
 
             } else if ( $("#glm-event-view-select option:selected").val() === "agenda"){
-                rows.fadeIn('slow', function(){});
+                agenda.css("display", "block");  
                 calendar.fadeOut('slow', function(){});
             }
         });