summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorChristophe.Boulain@gmail.com <>2012-04-10 12:26:56 +0000
committerChristophe.Boulain@gmail.com <>2012-04-10 12:26:56 +0000
commit8d34dd7caa1d61bcbd1c5a576024da74aa9f1c1f (patch)
tree579ef7e6acc030c2bcb9bf74826b52af963c3bee /framework
parent38ee39c4b52f0281594900d28bf9e819c8e8d051 (diff)
Fixed a bug in TValueTriggeredCallback introduced in r3117
Diffstat (limited to 'framework')
-rw-r--r--framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js11
1 files changed, 6 insertions, 5 deletions
diff --git a/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js b/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js
index 2f02594f..b15ceed3 100644
--- a/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js
+++ b/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js
@@ -199,7 +199,7 @@ Prado.WebUI.TTimeTriggeredCallback = Class.create(Prado.WebUI.Control,
this.timer = null;
}
},
-
+
resetTimer : function()
{
if(typeof(this.timer) != 'undefined')
@@ -215,7 +215,7 @@ Prado.WebUI.TTimeTriggeredCallback = Class.create(Prado.WebUI.Control,
var request = new Prado.CallbackRequest(this.options.EventTarget, this.options);
request.dispatch();
},
-
+
setTimerInterval : function(value)
{
if (this.options.Interval != value){
@@ -230,7 +230,7 @@ Prado.WebUI.TTimeTriggeredCallback = Class.create(Prado.WebUI.Control,
}
});
-Object.extend(Prado.WebUI.TTimeTriggeredCallback,
+Object.extend(Prado.WebUI.TTimeTriggeredCallback,
{
//class methods
@@ -253,7 +253,7 @@ Object.extend(Prado.WebUI.TTimeTriggeredCallback,
if(Prado.WebUI.TTimeTriggeredCallback.timers[id])
Prado.WebUI.TTimeTriggeredCallback.timers[id].stopTimer();
},
-
+
setTimerInterval : function (id,value)
{
if(Prado.WebUI.TTimeTriggeredCallback.timers[id])
@@ -333,6 +333,7 @@ Prado.WebUI.TValueTriggeredCallback = Class.create(Prado.WebUI.Control,
onInit : function(options)
{
+ this.options = options || {} ;
this.options.PropertyName = this.options.PropertyName || 'value';
var element = $(options['ControlID']);
this.value = element ? element[this.options.PropertyName] : undefined;
@@ -386,7 +387,7 @@ Prado.WebUI.TValueTriggeredCallback = Class.create(Prado.WebUI.Control,
}
});
-Object.extend(Prado.WebUI.TTimeTriggeredCallback,
+Object.extend(Prado.WebUI.TValueTriggeredCallback,
{
//class methods