update triggered callbacks.

2 files changed, 5 insertions, 3 deletions

diff --git a/framework/Web/UI/ActiveControls/TTimeTriggeredCallback.php b/framework/Web/UI/ActiveControls/TTimeTriggeredCallback.php
index 176539b4..52106f1e 100644
--- a/framework/Web/UI/ActiveControls/TTimeTriggeredCallback.php
+++ b/framework/Web/UI/ActiveControls/TTimeTriggeredCallback.php
@@ -115,9 +115,10 @@ class TTimeTriggeredCallback extends TCallback
 	/**
 	 * @return array list of timer options for client-side.
 	 */
-	protected function getTimerOptions()
+	protected function getTriggerOptions()
 	{
 		$options['ID'] = $this->getClientID();
+		$options['EventTarget']= $this->getUniqueID();
 		$options['Interval'] = $this->getInterval();
 		$options['DecayRate'] = $this->getDecayRate();
 		$options['DecayType'] = $this->getDecayType();
@@ -132,7 +133,7 @@ class TTimeTriggeredCallback extends TCallback
 	{
 		parent::render($writer);
 		$this->getActiveControl()->registerCallbackClientScript(
-			$this->getClientClassName(), $this->getTimerOptions());
+			$this->getClientClassName(), $this->getTriggerOptions());
 	}
 
 	/**
diff --git a/framework/Web/UI/ActiveControls/TTriggeredCallback.php b/framework/Web/UI/ActiveControls/TTriggeredCallback.php
index dc0ea869..b75d5fa9 100644
--- a/framework/Web/UI/ActiveControls/TTriggeredCallback.php
+++ b/framework/Web/UI/ActiveControls/TTriggeredCallback.php
@@ -61,7 +61,8 @@ abstract class TTriggeredCallback extends TCallback
 	 */

 	protected function getTriggerOptions()

 	{

-		$options['ID'] = $this->getUniqueID();

+		$options['ID'] = $this->getClientID();

+		$options['EventTarget'] = $this->getUniqueID();

 		$options['ControlID'] = $this->getTargetControl();

 		return $options;

 	}