changes to event popup so that reparsing not needed

2 files changed, 6 insertions, 3 deletions

diff --git a/functions/date_functions.php b/functions/date_functions.php
index 3e5e4b8..c6901d0 100644
--- a/functions/date_functions.php
+++ b/functions/date_functions.php
@@ -158,7 +158,7 @@ function chooseOffset($time) {
 }
 
 function openevent($event_date, $time, $uid, $arr, $lines = 0, $length = 0, $link_class = '', $pre_text = '', $post_text = '') {
-	global $cpath;
+	global $cpath, $master_array;
 	$event_text = stripslashes(urldecode($arr["event_text"]));
 	if (empty($start)) {
 		$title = $event_text;
@@ -183,11 +183,12 @@ function openevent($event_date, $time, $uid, $arr, $lines = 0, $length = 0, $lin
 			$escaped_date = addslashes($event_date);
 			$escaped_time = addslashes($time);
 			$escaped_uid = addslashes($uid);
+			$event_data = addslashes(serialize ($master_array[$event_date][$time][$uid]));
 			// fix for URL-length bug in IE: populate and submit a hidden form on click
 			static $popup_data_index = 0;
 $return = "
     <script language=\"Javascript\" type=\"text/javascript\"><!--
-    var eventData = new EventData('$escaped_date', '$escaped_time', '$escaped_uid','$cpath');
+    var eventData = new EventData('$escaped_date', '$escaped_time', '$escaped_uid','$cpath','$event_data');
     document.popup_data[$popup_data_index] = eventData;
     // --></script>";
 
diff --git a/functions/event.js b/functions/event.js
index 0072bd3..6895626 100644
--- a/functions/event.js
+++ b/functions/event.js
@@ -8,6 +8,7 @@ function openEventWindow(num) {
 	form.elements.time.value = data.time;
 	form.elements.uid.value = data.uid;
 	form.elements.cpath.value = data.cpath;
+	form.elements.event_data.value = data.event_data;
 	
 	// open a new window
 	var w = window.open('', 'Popup', 'scrollbars=yes,width=460,height=275');
@@ -15,11 +16,12 @@ function openEventWindow(num) {
 	form.submit();
 }
 
-function EventData(date, time, uid, cpath) {
+function EventData(date, time, uid, cpath, event_data) {
 	this.date = date;
 	this.time = time;
 	this.uid = uid;
 	this.cpath = cpath;
+	this.event_data = event_data;
 }
 
 function openTodoInfo(vtodo_array) {