r1258 - in trunk: themes/base ui
Author: pazu2k@gmail.com
Date: Tue Dec 23 11:39:28 2008
New Revision: 1258
Modified:
trunk/themes/base/ui.datepicker.css
trunk/ui/ui.datepicker.js
Log:
Datepicker - fixes #3695 [multi-datepicker layout issue in IE]: IE doesn't
seem to like dynamic widths so had no other choice but to hard code some
width values (this needs a better fix).
Modified: trunk/themes/base/ui.datepicker.css
==============================================================================
--- trunk/themes/base/ui.datepicker.css (original)
+++ trunk/themes/base/ui.datepicker.css Tue Dec 23 11:39:28 2008
@@ -44,4 +44,17 @@
.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current
{ float:right; }
.ui-datepicker-rtl .ui-datepicker-group { float:right; }
.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header {
border-right-width:0; border-left-width:1px; }
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header {
border-right-width:0; border-left-width:1px; }
\ No newline at end of file
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header {
border-right-width:0; border-left-width:1px; }
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-datepicker-cover {
+ display: none; /*sorry for IE5*/
+ display/**/: block; /*sorry for IE5*/
+ position: absolute; /*must have*/
+ z-index: -1; /*must have*/
+ filter: mask(); /*must have*/
+ top: -4px; /*must have*/
+ left: -4px; /*must have*/
+ width: 200px; /*must have*/
+ height: 200px; /*must have*/
+}
\ No newline at end of file
Modified: trunk/ui/ui.datepicker.js
==============================================================================
--- trunk/ui/ui.datepicker.js (original)
+++ trunk/ui/ui.datepicker.js Tue Dec 23 11:39:28 2008
@@ -595,6 +595,24 @@
.trigger('mouseover')
.end();
var numMonths = this._getNumberOfMonths(inst);
+ var months = this._get(inst, 'numberOfMonths');
+ var multi = '';
+ if (months > 1) {
+ if (months % 4 == 0) {
+ multi = 'ui-datepicker-multi-4';
+ inst.dpDiv.css('width','60em');
+ } else if (months % 3 == 0) {
+ multi = 'ui-datepicker-multi-3';
+ inst.dpDiv.css('width','51em');
+ } else if (months % 2 == 0) {
+ multi = 'ui-datepicker-multi-2';
+ inst.dpDiv.css('width','34em');
+ }
+ inst.dpDiv.addClass(multi);
+ } else {
+ inst.dpDiv.removeClass('ui-datepicker-multi-2 ui-datepicker-multi-3
ui-datepicker-multi-4');
+ inst.dpDiv.width('');
+ }
inst.dpDiv[(numMonths[0] != 1 || numMonths[1] != 1 ? 'add' : 'remove') +
'Class']('ui-datepicker-multi');
inst.dpDiv[(this._get(inst, 'isRTL') ? 'add' : 'remove') +