From f7f82ebae941e59cb738c79892254fa6964e8a1e Mon Sep 17 00:00:00 2001
From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Tue, 30 Aug 2016 10:39:43 -0400
Subject: [PATCH] test moving the ajax function call out of global scope and
 into the conditional check for view type (Calendar) to prevent an empty array
 being returned in the ajax response

---
 views/front/events/agenda.html | 38 ++++++++++++++++------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/views/front/events/agenda.html b/views/front/events/agenda.html
index a9a1352..17902c0 100644
--- a/views/front/events/agenda.html
+++ b/views/front/events/agenda.html
@@ -69,19 +69,7 @@
         var main_content = $("#main-content");
         var view = '{$cal_view}';
 
-        if(view === "calendar"){
-//            main_content.removeClass("small-8").addClass("small-12");
-            calendar.show();
-            rows.hide();
-            view_select.val('calendar');
-            
-        } else if ( view === "agenda"){
-            calendar.hide();
-            rows.show();
-            view_select.val('agenda');
-        }
-
-    
+   
         // AJAX FUNCTION ************************************************
         // Get calendar month via AJAX
         function eventsCalMonthAJAX(month) {
@@ -117,7 +105,7 @@
 //                    $("#eventCalendar").fullCalendar('addEventSource', buildingEvents);
 //                }
 //            });
-            jQuery.get('{$ajaxUrl}', dat, function (response){
+            jQuery.post('{$ajaxUrl}', dat, function (response){
                 var buildingEvents = [];
                     var events_obj = jQuery.parseJSON(response);
                     var events = events_obj.events;
@@ -135,7 +123,7 @@
                     $("#eventCalendar").fullCalendar('addEventSource', buildingEvents);
             });
         }
-        
+
         // Calendar *****************************************************
         $('#eventCalendar').fullCalendar({
             height: 900,
@@ -168,26 +156,36 @@
                 }
             }
         });
+        
+        if(view === "calendar"){
+            eventsCalMonthAJAX(month_obj);
+            console.log("test");
+//            main_content.removeClass("small-8").addClass("small-12");
+            calendar.show();
+            rows.hide();
+            view_select.val('calendar');
+            
+        } else if ( view === "agenda"){
+            calendar.hide();
+            rows.show();
+            view_select.val('agenda');
+        }
         $("#glm-event-view-select").on("change", function (){
             if($("#glm-event-view-select option:selected").val() === "calendar"){
-                
+                eventsCalMonthAJAX(month_obj);
                 main_content.removeClass("small-8").addClass("small-12");
                 rows.fadeOut('slow', function(){});
-//                search.fadeOut('slow', function(){});
                 calendar.fadeIn('slow', function(){});
                 calendar.fullCalendar('render');
-                eventsCalMonthAJAX(month_obj);
 
             } else if ( $("#glm-event-view-select option:selected").val() === "agenda"){
                 
                 rows.fadeIn('slow', function(){});
-//                search.fadeIn('slow', function(){});
                 calendar.fadeOut('slow', function(){});
             }
         });
         
         // initialize calendar with AJAX calls *************************************
-        eventsCalMonthAJAX(month_obj);
         $(document).on("click", "button.fc-button", function () {
             eventsCalMonthAJAX(month_obj);
         });
-- 
2.17.1