diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2011-05-04 14:09:37 -0700 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2011-05-04 14:09:37 -0700 |
| commit | 116acb4cb28c4a091547648132316b7f8e9e6072 (patch) | |
| tree | 2f3e70069b1874873e18095f149771889061cb2f | |
| parent | 511b86b31efd16e2966a1155cdb47b951f01c204 (diff) | |
| parent | fc97ccd398b60525fd9e4c0e9aa1f51048984394 (diff) | |
| download | jquery-ui-116acb4cb28c4a091547648132316b7f8e9e6072.tar.gz jquery-ui-116acb4cb28c4a091547648132316b7f8e9e6072.zip | |
Merge pull request #200 from kzys/trac-6704-2
Fixed #6704 - Display overflow when multiple datepickers have different numberOfMonths.
| -rw-r--r-- | tests/unit/datepicker/datepicker_core.js | 8 | ||||
| -rw-r--r-- | ui/jquery.ui.datepicker.js | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/tests/unit/datepicker/datepicker_core.js b/tests/unit/datepicker/datepicker_core.js index 78f78ce38..badb837ed 100644 --- a/tests/unit/datepicker/datepicker_core.js +++ b/tests/unit/datepicker/datepicker_core.js @@ -116,8 +116,16 @@ test('baseStructure', function() { ok(child.is('div.ui-datepicker-group') && child.is('div.ui-datepicker-group-last'), 'Structure multi [2] - second month division'); child = dp.children(':eq(2)'); ok(child.is('div.ui-datepicker-row-break'), 'Structure multi [2] - row break'); + ok(dp.is('.ui-datepicker-multi-2'), 'Structure multi [2] - multi-2'); inp.datepicker('hide').datepicker('destroy'); + // Multi-month 3 + inp = init('#inp', {numberOfMonths: 3}); + inp.focus(); + ok(dp.is('.ui-datepicker-multi-3'), 'Structure multi [3] - multi-3'); + ok(! dp.is('.ui-datepicker-multi-2'), 'Structure multi [3] - Trac #6704'); + inp.datepicker('hide').datepicker('destroy'); + // Multi-month [2, 2] inp = init('#inp', {numberOfMonths: [2, 2]}); inp.focus(); diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js index d49fb7781..92c005d19 100644 --- a/ui/jquery.ui.datepicker.js +++ b/ui/jquery.ui.datepicker.js @@ -685,10 +685,9 @@ $.extend(Datepicker.prototype, { var numMonths = this._getNumberOfMonths(inst); var cols = numMonths[1]; var width = 17; + inst.dpDiv.removeClass('ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4').width(''); if (cols > 1) inst.dpDiv.addClass('ui-datepicker-multi-' + cols).css('width', (width * cols) + 'em'); - else - inst.dpDiv.removeClass('ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4').width(''); inst.dpDiv[(numMonths[0] != 1 || numMonths[1] != 1 ? 'add' : 'remove') + 'Class']('ui-datepicker-multi'); inst.dpDiv[(this._get(inst, 'isRTL') ? 'add' : 'remove') + |