Implemented basic support for callback events for JUI controls; TJuiDraggable and TJuiDroppable examples

2 files changed, 22 insertions, 8 deletions

diff --git a/demos/quickstart/protected/pages/JuiControls/Samples/TJuiDroppable/Home.page b/demos/quickstart/protected/pages/JuiControls/Samples/TJuiDroppable/Home.page
index 59cd3838..6059fe60 100644
--- a/demos/quickstart/protected/pages/JuiControls/Samples/TJuiDroppable/Home.page
+++ b/demos/quickstart/protected/pages/JuiControls/Samples/TJuiDroppable/Home.page
@@ -1,5 +1,5 @@
 <com:TContent ID="body">
-<h1>TJuiDraggable Samples</h1>
+<h1>TJuiDroppable Samples</h1>
 
 <com:TStyleSheet>
 	.ui-draggable {
@@ -28,19 +28,19 @@
 <tr><td class="samplenote">
 Default options with a little css applied:
 </td><td class="sampleaction" style="height:600px">
-	<com:TJuiDraggable>
+	<com:TJuiDraggable ID="drag1">
 	Drag me around
 	</com:TJuiDraggable>
 
 	<com:TJuiDroppable OnDrop="drop1_ondrop" CssClass="drop-yellow">
 	Drop it here!
 	<br/><com:TActiveLabel ID="label1" />
-	</com:TJuiDroppable ID="drop1">
+	</com:TJuiDroppable>
 
 	<com:TJuiDroppable OnDrop="drop2_ondrop" CssClass="drop-red">
 	Drop it here!
 	<br/><com:TActiveLabel ID="label2" />
-	</com:TJuiDroppable ID="drop1">
+	</com:TJuiDroppable>
 </td></tr>
 
 </table>
diff --git a/demos/quickstart/protected/pages/JuiControls/Samples/TJuiDroppable/Home.php b/demos/quickstart/protected/pages/JuiControls/Samples/TJuiDroppable/Home.php
index cdbe85ba..c59d035c 100644
--- a/demos/quickstart/protected/pages/JuiControls/Samples/TJuiDroppable/Home.php
+++ b/demos/quickstart/protected/pages/JuiControls/Samples/TJuiDroppable/Home.php
@@ -4,13 +4,27 @@ class Home extends TPage
 {
 	public function drop1_ondrop($sender, $param)
 	{
-		$draggable=$param->getDroppedControl()->ID;
-		$this->label1->Text="Dropped ".$draggable." at: <br/>Top=".$param->getOffsetTop()." Left=".$param->getOffsetLeft();
+		$draggable=$param->DraggableControl;
+		/* Equals to:
+		 * $draggable=$param->getControl($param->getCallbackParameter()->draggable);
+		 */
+		$offset=$param->getCallbackParameter()->offset;
+		$target=$param->getCallbackParameter()->target->offset;
+		$top=$offset->top - $target->top;
+		$left=$offset->left - $target->left;
+		$this->label1->Text="Dropped ".$draggable->ID." at: <br/>Top=".$top." Left=".$left;
 	}
 
 	public function drop2_ondrop($sender, $param)
 	{
-		$draggable=$param->getDroppedControl()->ID;
-		$this->label2->Text="Dropped ".$draggable." at: <br/>Top=".$param->getOffsetTop()." Left=".$param->getOffsetLeft();
+		$draggable=$param->DraggableControl;
+		/* Equals to:
+		 * $draggable=$param->getControl($param->getCallbackParameter()->draggable);
+		 */
+		$offset=$param->getCallbackParameter()->offset;
+		$target=$param->getCallbackParameter()->target->offset;
+		$top=$offset->top - $target->top;
+		$left=$offset->left - $target->left;
+		$this->label2->Text="Dropped ".$draggable->ID." at: <br/>Top=".$top." Left=".$left;
 	}
 }