1 files changed, 12 insertions, 13 deletions

diff --git a/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js b/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js
index 71c9d73c..907d930e 100644
--- a/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js
+++ b/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js
@@ -50,18 +50,17 @@ Prado.WebUI.TActiveCheckBox = jQuery.klass(Prado.WebUI.CallbackControl,
 Prado.WebUI.TActiveRadioButton = jQuery.klass(Prado.WebUI.TActiveCheckBox);
 
 
-Prado.WebUI.TActiveCheckBoxList = jQuery.extend(
+Prado.WebUI.TActiveCheckBoxList = jQuery.klass(Prado.WebUI.Control,
 {
-	constructor : function(options)
+	onInit : function(options)
 	{
-		Prado.Registry[options.ListID] = this;
 		for(var i = 0; i<options.ItemCount; i++)
 		{
-			var checkBoxOptions = jQuery.extend(
+			var checkBoxOptions = jQuery.extend({}, options,
 			{
-				ID : options.ListID+"_c"+i,
+				ID : options.ID+"_c"+i,
 				EventTarget : options.ListName+"$c"+i
-			}, options);
+			});
 			new Prado.WebUI.TActiveCheckBox(checkBoxOptions);
 		}
 	}
@@ -108,9 +107,9 @@ Prado.WebUI.TJuiAutoComplete = jQuery.klass(Prado.WebUI.TActiveTextBox,
 		})
 		jQuery('#'+options.ID).autocomplete(this.options)
 		.data( "ui-autocomplete")._renderItem = function( ul, item ) {
-			return $( "<li>" )
+			return jQuery( "<li>" )
 			.attr( "data-value", item.value )
-			.append( $( "<a>" ).html( item.label ) )
+			.append( jQuery( "<a>" ).html( item.label ) )
 			.appendTo( ul );
 		};
 
@@ -283,7 +282,7 @@ Prado.WebUI.TEventTriggeredCallback = jQuery.klass(Prado.WebUI.Control,
 	onInit : function(options)
 	{
 		this.options = options || {} ;
-		var element = $('#'+options['ControlID']).get(0);
+		var element = jQuery('#'+options['ControlID']).get(0);
 		if(element)
 			this.observe(element, this.getEventName(element), this.doCallback.bind(this));
 	},
@@ -328,7 +327,7 @@ Prado.WebUI.TValueTriggeredCallback = jQuery.klass(Prado.WebUI.Control,
 	{
 		this.options = options || {} ;
 		this.options.PropertyName = this.options.PropertyName || 'value';
-		var element = $('#'+options['ControlID']).get(0);
+		var element = jQuery('#'+options['ControlID']).get(0);
 		this.value = element ? element[this.options.PropertyName] : undefined;
 		Prado.WebUI.TValueTriggeredCallback.register(this);
 		this.startObserving();
@@ -347,7 +346,7 @@ Prado.WebUI.TValueTriggeredCallback = jQuery.klass(Prado.WebUI.Control,
 
 	checkChanges : function()
 	{
-		var element = $('#'+this.options.ControlID).get(0);
+		var element = jQuery('#'+this.options.ControlID).get(0);
 		if(element)
 		{
 			var value = element[this.options.PropertyName];
@@ -401,7 +400,7 @@ Prado.WebUI.TActiveTableCell = jQuery.klass(Prado.WebUI.CallbackControl);
 Prado.WebUI.TActiveTableRow = jQuery.klass(Prado.WebUI.CallbackControl);
 
 Prado.WebUI.TActiveRatingList = jQuery.klass(Prado.WebUI.TRatingList,
-{	
+{
 	dispatchRequest : function(ev)
 	{
 		var requestOptions = jQuery.extend(
@@ -413,5 +412,5 @@ Prado.WebUI.TActiveRatingList = jQuery.klass(Prado.WebUI.TRatingList,
 		if(request.dispatch()==false)
 			ev.preventDefault();
 	}
-	
+
 });