From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Tue, 30 Aug 2016 15:04:59 +0000 (-0400)
Subject: adding php header function to set content type to json
X-Git-Tag: v1.3.3^2~18
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=16c35ea144f96e7bf0ad2be42af50a0926786baf;p=WP-Plugins%2Fglm-member-db-events.git

adding php header function to set content type to json
---

diff --git a/models/admin/ajax/eventsCalMonthAJAX.php b/models/admin/ajax/eventsCalMonthAJAX.php
index 3ed0e7f..db8e7e1 100644
--- a/models/admin/ajax/eventsCalMonthAJAX.php
+++ b/models/admin/ajax/eventsCalMonthAJAX.php
@@ -156,8 +156,8 @@ class GlmMembersAdmin_ajax_eventsCalMonthAJAX extends GlmDataEventsTimes
 //            'message' => '',
 //            'times'  => ''
         );
-
-        // Return stored image data
+        
+        header('Content-type:application/json;charset=utf-8', true);
         echo json_encode($return);
         wp_die();
     }
diff --git a/views/front/events/agenda.html b/views/front/events/agenda.html
index 218b095..f3cc9da 100644
--- a/views/front/events/agenda.html
+++ b/views/front/events/agenda.html
@@ -109,7 +109,8 @@
             var url = '{$ajaxUrl}' + '?t=' + timestamp;
             jQuery.post(url, dat, function (response){
                 var buildingEvents = [];
-                    var events_obj = jQuery.parseJSON(response);
+//                    var events_obj = jQuery.parseJSON(response);
+                    var events_obj = response;
                     var events = events_obj.events;
 
                     buildingEvents = $.map(events, function(i, val) { 
@@ -161,7 +162,6 @@
         
         if(view === "calendar"){
             eventsCalMonthAJAX(month_obj);
-            console.log("test");
 //            main_content.removeClass("small-8").addClass("small-12");
             calendar.show();
             rows.hide();