diff options
author | wei <> | 2006-12-10 23:55:49 +0000 |
---|---|---|
committer | wei <> | 2006-12-10 23:55:49 +0000 |
commit | 840854be7886236d46d3408de5a084983373b4c7 (patch) | |
tree | 8a8c22463bc3ac7f556633e790818d724bc52ed0 /framework/Web/Javascripts/prado | |
parent | 3c03a42d1edb0ec26110ace00f42e156cabff67b (diff) |
Fixed #470
Diffstat (limited to 'framework/Web/Javascripts/prado')
-rw-r--r-- | framework/Web/Javascripts/prado/ajax3.js | 29 | ||||
-rw-r--r-- | framework/Web/Javascripts/prado/controls.js | 4 | ||||
-rw-r--r-- | framework/Web/Javascripts/prado/validation3.js | 33 |
3 files changed, 25 insertions, 41 deletions
diff --git a/framework/Web/Javascripts/prado/ajax3.js b/framework/Web/Javascripts/prado/ajax3.js index f540813c..e176aa8a 100644 --- a/framework/Web/Javascripts/prado/ajax3.js +++ b/framework/Web/Javascripts/prado/ajax3.js @@ -399,33 +399,24 @@ Event.OnLoad(function() */
Prado.CallbackRequest.prototype =
{
- /**
- * Callback URL, same url as the current page.
- */
- url : window.location.href,
/**
- * Callback options, including onXXX events.
+ * Prepare and inititate a callback request.
*/
- options : { },
-
+ initialize : function(id, options)
+ {
/**
- * Callback target ID. E.g. $control->getUniqueID();
+ * Callback URL, same url as the current page.
*/
- id : null,
+ this.url = window.location.href;
- /**
- * Current callback request.
- */
- request : null,
+ /**
+ * Current callback request.
+ */
+ this.request = null;
- Enabled : true,
+ this.Enabled = true;
- /**
- * Prepare and inititate a callback request.
- */
- initialize : function(id, options)
- {
this.id = id;
this.options = Object.extend(
{
diff --git a/framework/Web/Javascripts/prado/controls.js b/framework/Web/Javascripts/prado/controls.js index 97969f87..390b1a25 100644 --- a/framework/Web/Javascripts/prado/controls.js +++ b/framework/Web/Javascripts/prado/controls.js @@ -4,10 +4,10 @@ Prado.WebUI.PostBackControl = Class.create(); Prado.WebUI.PostBackControl.prototype =
{
- _elementOnClick : null, //capture the element's onclick function
-
initialize : function(options)
{
+ this._elementOnClick = null, //capture the element's onclick function
+
this.element = $(options.ID);
if(this.onInit)
this.onInit(options);
diff --git a/framework/Web/Javascripts/prado/validation3.js b/framework/Web/Javascripts/prado/validation3.js index aa4c726b..b1734452 100644 --- a/framework/Web/Javascripts/prado/validation3.js +++ b/framework/Web/Javascripts/prado/validation3.js @@ -168,11 +168,6 @@ Prado.ValidationManager = Class.create(); */
Prado.ValidationManager.prototype =
{
- validators : [], // list of validators
- summaries : [], // validation summaries
- groups : [], // validation groups
- options : {},
-
/**
* <code>
* options['FormID']* The ID of HTML form to manage.
@@ -180,6 +175,11 @@ Prado.ValidationManager.prototype = */
initialize : function(options)
{
+ this.validators = []; // list of validators
+ this.summaries = []; // validation summaries
+ this.groups = []; // validation groups
+ this.options = {};
+
this.options = options;
Prado.Validation.managers[options.FormID] = this;
},
@@ -357,11 +357,6 @@ Prado.ValidationManager.prototype = Prado.WebUI.TValidationSummary = Class.create();
Prado.WebUI.TValidationSummary.prototype =
{
- group : null,
- options : {},
- visible : false,
- messages : null,
-
/**
* <code>
* options['ID']* Validation summary ID, i.e., an HTML element ID
@@ -564,16 +559,6 @@ Prado.WebUI.TValidationSummary.prototype = Prado.WebUI.TBaseValidator = Class.create();
Prado.WebUI.TBaseValidator.prototype =
{
- enabled : true,
- visible : false,
- isValid : true,
- options : {},
- _isObserving : {},
- group : null,
- manager : null,
- message : null,
- requestDispatched : false,
-
/**
* <code>
* options['ID']* Validator ID, e.g. span with message
@@ -597,6 +582,14 @@ Prado.WebUI.TBaseValidator.prototype = options.OnSuccess = options.OnSuccess || Prototype.emptyFunction;
options.OnError = options.OnError || Prototype.emptyFunction;
*/
+
+ this.enabled = true;
+ this.visible = false;
+ this.isValid = true;
+ this._isObserving = {};
+ this.group = null;
+ this.requestDispatched = false;
+
this.options = options;
this.control = $(options.ControlToValidate);
this.message = $(options.ID);
|