summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--framework/Web/Javascripts/prado/activecontrols3.js2
-rw-r--r--framework/Web/UI/ActiveControls/TActiveLinkButton.php2
-rw-r--r--index.html1
3 files changed, 3 insertions, 2 deletions
diff --git a/framework/Web/Javascripts/prado/activecontrols3.js b/framework/Web/Javascripts/prado/activecontrols3.js
index e608e71e..315ead78 100644
--- a/framework/Web/Javascripts/prado/activecontrols3.js
+++ b/framework/Web/Javascripts/prado/activecontrols3.js
@@ -145,7 +145,7 @@ Prado.WebUI.TTimeTriggeredCallback = Base.extend(
startTimer : function()
{
this.options.onComplete = this.onRequestComplete.bind(this);
- setTimeout(this.onTimerEvent.bind(this), 200);
+ this.timer = setTimeout(this.onTimerEvent.bind(this), 200);
},
stopTimer : function()
diff --git a/framework/Web/UI/ActiveControls/TActiveLinkButton.php b/framework/Web/UI/ActiveControls/TActiveLinkButton.php
index cdb346f9..30c62723 100644
--- a/framework/Web/UI/ActiveControls/TActiveLinkButton.php
+++ b/framework/Web/UI/ActiveControls/TActiveLinkButton.php
@@ -85,7 +85,7 @@ class TActiveLinkButton extends TLinkButton implements IActiveControl, ICallback
{
parent::setText($value);
if($this->getActiveControl()->canUpdateClientSide())
- $this->getPage()->getCallbackClient()->setAttribute($this, 'value', $value);
+ $this->getPage()->getCallbackClient()->replace($this, $value);
}
/**
diff --git a/index.html b/index.html
index d2dc979e..3a0a9657 100644
--- a/index.html
+++ b/index.html
@@ -107,6 +107,7 @@ PRADO component tags when you use it to edit PRADO templates.
<ul>
<li>Stever for providing an Apple G3 notebook for testing safari browser issues.</li>
<li>Stanislav Yordanov - the script of generating Dreameweaver extension for PRADO</li>
+<li>Andrés Adolfo Testi - original concept and naming for Active Controls.</li>
<li>All PRADO users - great suggestions, feedback and support</li>
<li>ASP.NET 2.0 for its great inspiration and reference</li>
<li>All <a href="framework/3rdParty/readme.html">third-party work</a> used in PRADO</li>