From da32eb81fbf9f74ed9be3f8414e756aba8c65fd8 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 3 Apr 2013 07:49:04 +0000
Subject: [PATCH] using egw.LAB.wait for jscalendar

---
 phpgwapi/inc/class.jscalendar.inc.php | 38 +++++++++++----------------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/phpgwapi/inc/class.jscalendar.inc.php b/phpgwapi/inc/class.jscalendar.inc.php
index 1c75a80562..459f5a6af6 100644
--- a/phpgwapi/inc/class.jscalendar.inc.php
+++ b/phpgwapi/inc/class.jscalendar.inc.php
@@ -130,30 +130,23 @@ class jscalendar
 			" onBlur=\"self.status=''; return true;\"";
 		}
 
-		if ($jsreturn)
-		{
-			$return_array = array(
-				'html' => '<input type="text" id="'.$name.'" name="'.$name.'" size="10" value="'.htmlspecialchars($date).'"'.$options.'/>'.
-					($useicon ? '<img id="'.$name.'-trigger" src="'.common::find_image('phpgwpai','datepopup').'" title="'.lang('Select date').'" style="cursor:pointer; cursor:hand;"/>' : ''),
-				'js'   => 'Calendar.setup({inputField : "'.$name.'"'.($useicon ? ',button: "'.$name.'-trigger"' : '').' });'
-			);
+		$html = '<input type="text" id="'.$name.'" name="'.$name.'" size="10" value="'.htmlspecialchars($date).'"'.$options.'/>
+'.($useicon ? '<img id="'.$name.'-trigger" src="'.common::find_image('phpgwapi','datepopup').'" title="'.lang('Select date').'" style="cursor:pointer; cursor:hand;">' : '');
 
-			return $return_array;
-		}
-		return
-'<input type="text" id="'.$name.'" name="'.$name.'" size="10" value="'.htmlspecialchars($date).'"'.$options.'/>
-'.($useicon ? '<img id="'.$name.'-trigger" src="'.common::find_image('phpgwapi','datepopup').'" title="'.lang('Select date').'" style="cursor:pointer; cursor:hand;">' : '').
-'<script type="text/javascript">
-	'.(!$useicon ? 'document.getElementById("'.$name.'").readOnly=true;' : '').
-	'Calendar.setup(
-		{
+		$js = '<script type="text/javascript">
+'.(!$useicon ? '	document.getElementById("'.$name.'").readOnly=true;' : '').
+'	egw.LAB.wait(function() {
+		Calendar.setup({
 			inputField  : "'.$name.'",'.(!$useicon ? '' : '
 			button      : "'.$name.'-trigger"').',
 			onUpdate    : function(){var input = document.getElementById("'.$name.'"); $j(input).change(); }
-		}
-	);
+		})
+	});
 </script>
 ';
+		if ($jsreturn) return array('html' => $html, 'js' => $js);
+
+		return $html."\n".$js;
 	}
 
 	/**
@@ -234,8 +227,8 @@ function monthClicked(calendar,monthstart) {
 }
 ' : '').'
 
-	Calendar.setup(
-	{
+egw.LAB.wait(function() {
+	Calendar.setup({
   		flat         : "'.$id.'",
   		flatCallback : dateChanged'.($weekUrl ? ',
   		flatWeekCallback : weekClicked' : '').($weekTTip ? ',
@@ -245,9 +238,8 @@ function monthClicked(calendar,monthstart) {
 		flatTodayCallback : todayClicked,
  		date : "'.$date.'"
 		' : '').'
-	}
-	);
-
+	});
+});
 </script>';
 	}