diff options
| author | Ca-Phun Ung <pazu2k@gmail.com> | 2010-02-09 04:09:26 +0000 |
|---|---|---|
| committer | Ca-Phun Ung <pazu2k@gmail.com> | 2010-02-09 04:09:26 +0000 |
| commit | 5eeaa658ba1a37d3ced10a5435a0b302a922c199 (patch) | |
| tree | 487cc7999fed5b05da09709028c40b4dabc2b2d6 | |
| parent | b20df98b18dbd32ce03750e458619bd1e26464ea (diff) | |
| download | jquery-ui-5eeaa658ba1a37d3ced10a5435a0b302a922c199.tar.gz jquery-ui-5eeaa658ba1a37d3ced10a5435a0b302a922c199.zip | |
datepicker: fixes #4443: Datepicker's vertical position in thickbox. This also fixes the virtual position when the datepicker is close but not right at the bottom of the page.
| -rw-r--r-- | tests/visual/datepicker/datepicker_ticket_4443.html | 37 | ||||
| -rw-r--r-- | ui/jquery.ui.datepicker.js | 2 |
2 files changed, 38 insertions, 1 deletions
diff --git a/tests/visual/datepicker/datepicker_ticket_4443.html b/tests/visual/datepicker/datepicker_ticket_4443.html new file mode 100644 index 000000000..84f08b99b --- /dev/null +++ b/tests/visual/datepicker/datepicker_ticket_4443.html @@ -0,0 +1,37 @@ +<!doctype html> +<html lang="en"> +<head> + <title>Datepicker Visual Test : Datepicker ticket #4443</title> + <link rel="stylesheet" href="../visual.css" type="text/css" /> + <link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css"> + <link rel="stylesheet" href="http://jquery.com/demo/thickbox/thickbox-code/thickbox.css" type="text/css" /> + <script type="text/javascript" src="../../../jquery-1.4.1.js"></script> + <script src="http://jquery.com/demo/thickbox/thickbox-code/thickbox-compressed.js"></script> + <script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script> + <script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script> + <script type="text/javascript" src="../../../ui/jquery.ui.datepicker.js"></script> + <script type="text/javascript"> + $(function() { + + $('.datepicker').datepicker(); + + }); + </script> + <style type="text/css"> + button { display: block; } + </style> +</head> +<body> + +<h1 class="ui-widget-header"><a href="http://dev.jqueryui.com/ticket/4443">#4443 - Datepicker's vertical position in thickbox is wrong</a></h1> + +<p><input alt="#TB_inline?height=150&width=400&inlineId=myOnPageContent" title="add a caption to title attribute / or leave blank" class="thickbox" type="button" value="Show" /></p> + +<div id="myOnPageContent" style="display:none"> + <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.</p> + <p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.</p> + <input type="text" class="datepicker" /> +</div> + +</body> +</html> diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js index 91f863ef9..03d58681a 100644 --- a/ui/jquery.ui.datepicker.js +++ b/ui/jquery.ui.datepicker.js @@ -725,7 +725,7 @@ $.extend(Datepicker.prototype, { offset.left -= Math.min(offset.left, (offset.left + dpWidth > viewWidth && viewWidth > dpWidth) ? Math.abs(offset.left + dpWidth - viewWidth) : 0); offset.top -= Math.min(offset.top, (offset.top + dpHeight > viewHeight && viewHeight > dpHeight) ? - Math.abs(offset.top + dpHeight + inputHeight * 2 - viewHeight) : 0); + Math.abs(dpHeight + inputHeight) : 0); return offset; }, |