Upgrade to Prototype 1.6.0.2 & Scriptaculous 1.8.1

7 files changed, 64 insertions, 44 deletions

diff --git a/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js b/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js
index 6fd71948..2ec9eab1 100644
--- a/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js
+++ b/framework/Web/Javascripts/source/prado/activecontrols/ajax3.js
@@ -230,10 +230,7 @@ Object.extend(Prado.CallbackRequest,
 		"on500" : function(request, transport, data)

 		{

 			var e = request.getHeaderData(Prado.CallbackRequest.ERROR_HEADER);

-			if (e)

-				Logger.error("Callback Server Error "+e.code, this.formatException(e));

-			else

-				Logger.error("Callback Server Error Unknown",'');

+			Logger.error("Callback Server Error "+e.code, this.formatException(e));

 		},

 

 		/**

@@ -340,8 +337,8 @@ Object.extend(Prado.CallbackRequest,
 			//else

 				//Logger.warn('empty queque');

 		}

-//		else

-	//		Logger.warn('current request ' + self.currentRequest.id);

+		//else

+			//Logger.warn('current request ' + self.currentRequest.id);

 	},

 

 	/**

@@ -363,15 +360,15 @@ Object.extend(Prado.CallbackRequest,
 			{

 				if(typeof(Logger) != "undefined")

 					Logger.warn("Missing page state:"+data);

-//				Logger.warn('## bad state: setting current request to null');

+				//Logger.warn('## bad state: setting current request to null');

 				self.endCurrentRequest();

 				//self.tryNextRequest();

 				return false;

 			}

 		}

 		self.endCurrentRequest();

-	//	Logger.warn('## state updated: setting current request to null');

-	//	self.tryNextRequest();

+		//Logger.warn('## state updated: setting current request to null');

+		//self.tryNextRequest();

 		return true;

 	},

 

@@ -433,11 +430,8 @@ Object.extend(Prado.CallbackRequest,
  */

 Ajax.Responders.register({onComplete : function(request)

 {

-	if(request && request instanceof Prado.AjaxRequest)

-	{

-		if(request.ActiveControl.HasPriority)

-			Prado.CallbackRequest.tryNextRequest();

-	}

+	if(request.ActiveControl.HasPriority)

+		Prado.CallbackRequest.tryNextRequest();

 }});

 

 //Add HTTP exception respones when logger is enabled.

@@ -463,25 +457,19 @@ Prado.CallbackRequest.prototype = Object.extend(Prado.AjaxRequest.prototype,
 	 */

 	initialize : function(id, options)

 	{

-	/**

-	 * Callback URL, same url as the current page.

-	 */

-		this.url = this.getCallbackUrl();

-

-		this.transport = Ajax.getTransport();

-//		this.setOptions(request.options);

-//		this.request(request.url);

 		/**

-		 * Current callback request.

+		 * Callback URL, same url as the current page.

 		 */

-		//this.request = null;

-

+		this.url = this.getCallbackUrl();

+		

+		this.transport = Ajax.getTransport();

 		this.Enabled = true;

-

 		this.id = id;

-		if(typeof(id)=="string")

+		

+		if(typeof(id)=="string"){

 			Prado.CallbackRequest.requests[id] = this;

-

+		}

+		

 		this.setOptions(Object.extend(

 		{

 			RequestTimeOut : 30000, // 30 second timeout.

@@ -494,7 +482,31 @@ Prado.CallbackRequest.prototype = Object.extend(Prado.AjaxRequest.prototype,
 

 		this.ActiveControl = this.options;

 	},

-

+	

+	/**

+	 * Sets the request options

+	 * @return {Array} request options.

+	 */

+	setOptions: function(options){

+		

+		this.options = {

+			method:       'post',

+			asynchronous: true,

+			contentType:  'application/x-www-form-urlencoded',

+			encoding:     'UTF-8',

+			parameters:   '',

+			evalJSON:     true,

+			evalJS:       true

+		};

+		

+		Object.extend(this.options, options || { });

+

+		this.options.method = this.options.method.toLowerCase();

+		if(Object.isString(this.options.parameters)){

+			this.options.parameters = this.options.parameters.toQueryParams();

+		}

+	},

+	

 	/**

 	 * Gets the url from the forms that contains the PRADO_PAGESTATE

 	 * @return {String} callback url.

diff --git a/framework/Web/Javascripts/source/prado/colorpicker/colorpicker.js b/framework/Web/Javascripts/source/prado/colorpicker/colorpicker.js
index 557b4b51..66a79922 100644
--- a/framework/Web/Javascripts/source/prado/colorpicker/colorpicker.js
+++ b/framework/Web/Javascripts/source/prado/colorpicker/colorpicker.js
@@ -334,7 +334,7 @@ Object.extend(Prado.WebUI.TColorPicker.prototype,
 	{

 		if(!this.showing)

 		{

-			var pos = Position.positionedOffset(this.input);

+			var pos = this.input.positionedOffset();

 			pos[1] += this.input.offsetHeight;

 

 			this.element.style.top = (pos[1]-1) + "px";

@@ -641,7 +641,7 @@ Object.extend(Prado.WebUI.TColorPicker.prototype,
 	{

 		var px = Event.pointerX(ev);

 		var py = Event.pointerY(ev);

-		var pos = Position.cumulativeOffset(this.inputs.background);

+		var pos = this.inputs.background.cumulativeOffset();

 

 		var x = this.truncate(px - pos[0],0,255);

 		var y = this.truncate(py - pos[1],0,255);

@@ -672,7 +672,7 @@ Object.extend(Prado.WebUI.TColorPicker.prototype,
 	changeH : function(ev)

 	{

 		var py = Event.pointerY(ev);

-		var pos = Position.cumulativeOffset(this.inputs.background);

+		var pos = this.inputs.background.cumulativeOffset();

 		var y = this.truncate(py - pos[1],0,255);

 

 		var h = (255-y)/255;

diff --git a/framework/Web/Javascripts/source/prado/controls/controls.js b/framework/Web/Javascripts/source/prado/controls/controls.js
index ba472b70..bea18e76 100644
--- a/framework/Web/Javascripts/source/prado/controls/controls.js
+++ b/framework/Web/Javascripts/source/prado/controls/controls.js
@@ -84,7 +84,7 @@ Object.extend(Prado.WebUI.TImageButton.prototype,
 	 */

 	addXYInput : function(event,options)

 	{

-		imagePos = Position.cumulativeOffset(this.element);

+		imagePos = this.element.cumulativeOffset();

 		clickedPos = [event.clientX, event.clientY];

 		x = clickedPos[0]-imagePos[0]+1;

 		y = clickedPos[1]-imagePos[1]+1;

diff --git a/framework/Web/Javascripts/source/prado/controls/slider.js b/framework/Web/Javascripts/source/prado/controls/slider.js
index c2725141..593e6e87 100644
--- a/framework/Web/Javascripts/source/prado/controls/slider.js
+++ b/framework/Web/Javascripts/source/prado/controls/slider.js
@@ -165,17 +165,17 @@ Prado.WebUI.TSlider = Class.extend(Prado.WebUI.PostBackControl,
 				var pointer  = [Event.pointerX(event), Event.pointerY(event)];
 				var track = handle;
 				if(track==this.track) {
-					var offsets  = Position.cumulativeOffset(this.track); 
+					var offsets  = this.track.cumulativeOffset(); 
 					this.event = event;
 					this.setValue(this.translateToValue( 
 						(this.isVertical() ? pointer[1]-offsets[1] : pointer[0]-offsets[0])-(this.handleLength/2)
 					));
-					var offsets  = Position.cumulativeOffset(this.handle);
+					var offsets  = this.handle.cumulativeOffset();
 					this.offsetX = (pointer[0] - offsets[0]);
 					this.offsetY = (pointer[1] - offsets[1]);
 				} else {
 					this.updateStyles();
-					var offsets  = Position.cumulativeOffset(this.handle);
+					var offsets  = this.handle.cumulativeOffset();
 					this.offsetX = (pointer[0] - offsets[0]);
 					this.offsetY = (pointer[1] - offsets[1]);
 				}
@@ -195,7 +195,7 @@ Prado.WebUI.TSlider = Class.extend(Prado.WebUI.PostBackControl,
 	
 	draw: function(event) {
 		var pointer = [Event.pointerX(event), Event.pointerY(event)];
-		var offsets = Position.cumulativeOffset(this.track);
+		var offsets = this.track.cumulativeOffset();
 		pointer[0] -= this.offsetX + offsets[0];
 		pointer[1] -= this.offsetY + offsets[1];
 		this.event = event;
diff --git a/framework/Web/Javascripts/source/prado/datepicker/datepicker.js b/framework/Web/Javascripts/source/prado/datepicker/datepicker.js
index f502b0d3..cc5b9c1e 100644
--- a/framework/Web/Javascripts/source/prado/datepicker/datepicker.js
+++ b/framework/Web/Javascripts/source/prado/datepicker/datepicker.js
@@ -599,7 +599,7 @@ Prado.WebUI.TDatePicker.prototype =
 

 		if(!this.showing)

 		{

-			var pos = Position.positionedOffset(this.control);

+			var pos = this.control.positionedOffset();

 

 			pos[1] += this.getDatePickerOffsetHeight();

 

diff --git a/framework/Web/Javascripts/source/prado/scriptaculous-adapter.js b/framework/Web/Javascripts/source/prado/scriptaculous-adapter.js
index ba2e4593..2423df9a 100644
--- a/framework/Web/Javascripts/source/prado/scriptaculous-adapter.js
+++ b/framework/Web/Javascripts/source/prado/scriptaculous-adapter.js
@@ -553,22 +553,22 @@ Prado.Element.Insert =
 {

 	append: function(element, content)

 	{

-		new Insertion.Bottom(element, content);

+		$(element).insert(content);

 	},

 

 	prepend: function(element, content)

 	{

-		new Insertion.Top(element, content);

+		$(element).insert({top:content});

 	},

 

 	after: function(element, content)

 	{

-		new Insertion.After(element, content);

+		$(element).insert({after:content});

 	},

 

 	before: function(element, content)

 	{

-		new Insertion.Before(element, content);

+		$(element).insert({before:content});

 	}

 };

 

@@ -1033,4 +1033,12 @@ Object.extend(Date,
 		var newdate=new Date(year,month-1,date, 0, 0, 0);

 		return newdate;

 	}

-});
\ No newline at end of file
+});

+

+Prado.Effect = 

+{

+	Highlight : function (element,options)

+	{

+		new Effect.Highlight(element,options);

+	}

+};

diff --git a/framework/Web/Javascripts/source/prado/validator/validation3.js b/framework/Web/Javascripts/source/prado/validator/validation3.js
index c7b23040..ffdbe7b0 100644
--- a/framework/Web/Javascripts/source/prado/validator/validation3.js
+++ b/framework/Web/Javascripts/source/prado/validator/validation3.js
@@ -419,7 +419,7 @@ Prado.WebUI.TValidationSummary.prototype =
 	{

 		while(this.messages.childNodes.length > 0)

 			this.messages.removeChild(this.messages.lastChild);

-		new Insertion.Bottom(this.messages, this.formatSummary(messages));

+		this.messages.insert(this.formatSummary(messages));

 	},

 

 	/**