From 25389b5a2d29510d6e9066232a64719f9bd7b3eb Mon Sep 17 00:00:00 2001
From: Piotr Mitros <pmitros@mit.edu>
Date: Mon, 16 Jan 2012 13:24:52 -0500
Subject: [PATCH] Close page event logging works in FF and Chrome

---
 js/video_player.js | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/js/video_player.js b/js/video_player.js
index 03f3bd310d..152a1b0974 100644
--- a/js/video_player.js
+++ b/js/video_player.js
@@ -1,19 +1,23 @@
 // Things to abstract out to another file
 
-var close_event_logged = false;
+// We do sync AJAX for just the page close event. 
+// TODO: This should _really_ not be a global. 
+var log_close_event = false; 
 
 function log_close() {
     var d=new Date();
     var t=d.getTime();
-    close_event_logged = "waiting";
+    //close_event_logged = "waiting";
+    log_close_event = true;
     log_event('page_close', {});
+    log_close_event = false;
     // Google Chrome will close without letting the event go through.
     // This causes the page close to be delayed until we've hit the
-    // server.
+    // server. The code below fixes it, but breaks Firefox. 
     // TODO: Check what happens with no network. 
-    while((close_event_logged != "done") && (d.getTime() < t+500)) {
+    /*while((close_event_logged != "done") && (d.getTime() < t+500)) {
 	console.log(close_event_logged);
-    }
+    }*/
 }
 
 window.onbeforeunload = log_close;
@@ -217,19 +221,28 @@ function videoDestroy() {
 }
 
 function log_event(e, d) {
-    $.get("/event", 
-	  {
-	      "event_type" : e, 
-		  "event" : JSON.stringify(d),
-		  "page" : document.URL
-		  },
+    data = {
+	"event_type" : e, 
+	"event" : JSON.stringify(d),
+	"page" : document.URL
+    }
+    $.ajax({type:'GET',
+	    url: '/event',
+	    dataType: 'json',
+	    data: data,
+	    async: !log_close_event, // HACK: See comment on log_close_event
+	    success: function(){},
+	    headers : {'X-CSRFToken':getCookie('csrftoken')}
+	   });
+
+    /*, // Commenting out Chrome bug fix, since it breaks FF
 	  function(data) {
 	      console.log("closing");
 	      if (close_event_logged == "waiting") {
 		  close_event_logged = "done";
 	      console.log("closed");
 	  }
-	  });
+	  });*/
 }
 
 function seek_slide(type,oe,value) {