From: Ca-Phun Ung Date: Sun, 1 Feb 2009 05:50:12 +0000 (+0000) Subject: datepicker: #4032 - Incorrect layout in multiple month rows. I noticed the static... X-Git-Tag: 1.6~121 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1866e1382f7ef89721432cb75e505356f067f99d;p=jquery-ui.git datepicker: #4032 - Incorrect layout in multiple month rows. I noticed the static tests were recently updated with a row-break so I have added the row-break fix for now so it will be ready for the release. We should seriously consider inline-block. --- diff --git a/tests/visual/datepicker/multimonth.html b/tests/visual/datepicker/multimonth.html new file mode 100644 index 000000000..c59d75b13 --- /dev/null +++ b/tests/visual/datepicker/multimonth.html @@ -0,0 +1,21 @@ + + + + Datepicker Visual Test : Default + + + + + + + + + +
+ + + diff --git a/themes/base/ui.datepicker.css b/themes/base/ui.datepicker.css index 92986c9e8..567f8c97b 100644 --- a/themes/base/ui.datepicker.css +++ b/themes/base/ui.datepicker.css @@ -33,7 +33,7 @@ .ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; } .ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; } .ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; } -.ui-datepicker-row-break { clear:left; width:100%; } +.ui-datepicker-row-break { clear:both; width:100%; } /* RTL support */ .ui-datepicker-rtl { direction: rtl; } diff --git a/ui/ui.datepicker.js b/ui/ui.datepicker.js index 9237de33f..eb3162f02 100644 --- a/ui/ui.datepicker.js +++ b/ui/ui.datepicker.js @@ -1400,7 +1400,8 @@ $.extend(Datepicker.prototype, { drawMonth = 0; drawYear++; } - calender += '' + (isMultiMonth ? '' : ''); + calender += '' + (isMultiMonth ? '' + + ((numMonths[0] > 0 && col == numMonths[1]-1) ? '
' : '') : ''); group += calender; } html += group;