Merge from 3.0 branch till 1224.

1 files changed, 4 insertions, 4 deletions

diff --git a/framework/Web/Javascripts/datepicker/datepicker.js b/framework/Web/Javascripts/datepicker/datepicker.js
index 11bee07e..4525c1ba 100644
--- a/framework/Web/Javascripts/datepicker/datepicker.js
+++ b/framework/Web/Javascripts/datepicker/datepicker.js
@@ -247,10 +247,10 @@ Prado.WebUI.TDatePicker.prototype =
 			this.iePopUp.style.position = "absolute"

 			this.iePopUp.scrolling="no"

 			this.iePopUp.frameBorder="0"

-			document.body.appendChild(this.iePopUp);

+			this.control.parentNode.appendChild(this.iePopUp);

 		}

 

-		document.body.appendChild(this._calDiv);

+		this.control.parentNode.appendChild(this._calDiv);

 		

 		this.update();

 		this.updateHeader();

@@ -542,8 +542,8 @@ Prado.WebUI.TDatePicker.prototype =
 			

 		if(!this.showing)

 		{

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

-			

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

+						

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

 			

 			this._calDiv.style.display = "block";