summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--framework/Web/Javascripts/js/datepicker.js8
-rw-r--r--framework/Web/Javascripts/prado/datepicker.js4
-rw-r--r--framework/Web/UI/WebControls/TDatePicker.php2
-rw-r--r--tests/FunctionalTests/protected/pages/UI/DatePicker.page2
4 files changed, 11 insertions, 5 deletions
diff --git a/framework/Web/Javascripts/js/datepicker.js b/framework/Web/Javascripts/js/datepicker.js
index d4ba0d2c..e840fc68 100644
--- a/framework/Web/Javascripts/js/datepicker.js
+++ b/framework/Web/Javascripts/js/datepicker.js
@@ -128,6 +128,14 @@ _20.className="clearButton";
_19="Clear";
_20.appendChild(document.createTextNode(_19));
_4.appendChild(_20);
+if(Prado.Browser().ie){
+this.iePopUp=document.createElement("iframe");
+this.iePopUp.src="";
+this.iePopUp.style.position="absolute";
+this.iePopUp.scrolling="no";
+this.iePopUp.frameBorder="0";
+document.body.appendChild(this.iePopUp);
+}
document.body.appendChild(this._calDiv);
this.update();
this.updateHeader();
diff --git a/framework/Web/Javascripts/prado/datepicker.js b/framework/Web/Javascripts/prado/datepicker.js
index 680008bd..f3c6ff27 100644
--- a/framework/Web/Javascripts/prado/datepicker.js
+++ b/framework/Web/Javascripts/prado/datepicker.js
@@ -199,7 +199,7 @@ Prado.WebUI.TDatePicker.prototype =
clearButton.appendChild(document.createTextNode(buttonText));
div.appendChild(clearButton);
-/* if(Prado.Browser().ie)
+ if(Prado.Browser().ie)
{
this.iePopUp = document.createElement('iframe');
this.iePopUp.src = "";
@@ -207,7 +207,7 @@ Prado.WebUI.TDatePicker.prototype =
this.iePopUp.scrolling="no"
this.iePopUp.frameBorder="0"
document.body.appendChild(this.iePopUp);
- }*/
+ }
document.body.appendChild(this._calDiv);
diff --git a/framework/Web/UI/WebControls/TDatePicker.php b/framework/Web/UI/WebControls/TDatePicker.php
index a8fb363e..125b97c3 100644
--- a/framework/Web/UI/WebControls/TDatePicker.php
+++ b/framework/Web/UI/WebControls/TDatePicker.php
@@ -235,7 +235,7 @@ class TDatePicker extends TTextBox
$serializer = new TJavascriptSerializer($this->getDatePickerOptions());
$options = $serializer->toJavascript();
$id = $this->getClientID();
- $code = "new Prado.WebUI.TDatePicker('$id', $options);";
+ $code = "Event.OnLoad(function(){ new Prado.WebUI.TDatePicker('$id', $options); });";
$scripts->registerEndScript("prado:$id", $code);
}
}
diff --git a/tests/FunctionalTests/protected/pages/UI/DatePicker.page b/tests/FunctionalTests/protected/pages/UI/DatePicker.page
index 7208a76b..ec2c2644 100644
--- a/tests/FunctionalTests/protected/pages/UI/DatePicker.page
+++ b/tests/FunctionalTests/protected/pages/UI/DatePicker.page
@@ -1,7 +1,5 @@
<com:TContent ID="Content">
<com:TForm>
- <com:TDatePicker Mode="Button" />
- <p>aaaa<br />aaaa<br />aaaa<br />aaaa<br />aaaa<br /></p>
<com:TDatePicker />
</com:TForm>
</com:TContent> \ No newline at end of file