From 8d34dd7caa1d61bcbd1c5a576024da74aa9f1c1f Mon Sep 17 00:00:00 2001 From: "Christophe.Boulain@gmail.com" <> Date: Tue, 10 Apr 2012 12:26:56 +0000 Subject: Fixed a bug in TValueTriggeredCallback introduced in r3117 --- .../source/prado/activecontrols/activecontrols3.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'framework') 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 -- cgit v1.2.3