Ported TCallback + demo

2 files changed, 4 insertions, 1 deletions

diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/TCallback/Home.page b/demos/quickstart/protected/pages/ActiveControls/Samples/TCallback/Home.page
index 04781438..6be81e96 100755
--- a/demos/quickstart/protected/pages/ActiveControls/Samples/TCallback/Home.page
+++ b/demos/quickstart/protected/pages/ActiveControls/Samples/TCallback/Home.page
@@ -39,7 +39,7 @@ The third parameter is taken from the textbox;
   {

     var request = <%= $this->callback2->ActiveControl->Javascript %>;

     var param2 = 'value 2';

-    var param3 = $('<%= $this->txt1->ClientID %>').value;

+    var param3 = $('#<%= $this->txt1->ClientID %>').val();

     request.setCallbackParameter({'Param1':param1, 'Param2':param2, 'Param3':param3});

     request.dispatch();

   }

diff --git a/framework/Web/UI/ActiveControls/TBaseActiveControl.php b/framework/Web/UI/ActiveControls/TBaseActiveControl.php
index 61230719..f4daec02 100644
--- a/framework/Web/UI/ActiveControls/TBaseActiveControl.php
+++ b/framework/Web/UI/ActiveControls/TBaseActiveControl.php
@@ -332,6 +332,9 @@ class TBaseActiveCallbackControl extends TBaseActiveControl
 		$options['CausesValidation']= $validate ? '' : false;
 		$options['ValidationGroup']=$this->getValidationGroup();
 		$options['CallbackParameter'] = $this->getCallbackParameter();
+		// needed for TCallback
+		if(!isset($options['EventTarget']))
+			$options['EventTarget'] = $this->getControl()->getUniqueID();
 		return $options;
 	}