Datepicker #3647: Added RTL support to the datepicker theme and reverted markup chang...

diff --git a/themes/base/ui.datepicker.css b/themes/base/ui.datepicker.css
index 71304af6bb178df4b9e63be6174b72f1b996ec24..dd0ab1cbde031362b63f1da05d21d86426e22484 100644 (file)
--- a/themes/base/ui.datepicker.css
+++ b/themes/base/ui.datepicker.css
@@ -29,14 +29,19 @@
 .ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
 .ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
 .ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left:0; }
-.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left:0; }
+.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; }
 
 /* RTL support */
+.ui-datepicker-rtl { direction: rtl; }
 .ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
 .ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
 .ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
 .ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
 .ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
\ No newline at end of file
+.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

diff --git a/ui/ui.datepicker.js b/ui/ui.datepicker.js
index 02623609312ecb757f5a58012b12f6e3777caf4c..1a64b0b5c72f82514dbeae5ff9560a9ac9e1c9cb 100644 (file)
--- a/ui/ui.datepicker.js
+++ b/ui/ui.datepicker.js
@@ -1343,8 +1343,8 @@ $.extend(Datepicker.prototype, {
                                var thead = '';
                                for (var dow = 0; dow < 7; dow++) { // days of the week
                                        var day = (dow + firstDay) % 7;
-                                       thead = (isRTL ? '' : thead) + '<th' + ((dow + firstDay + 6) % 7 >= 5 ? ' class="ui-datepicker-week-end"' : '') + '>' +
-                                               '<span title="' + dayNames[day] + '">' + dayNamesMin[day] + '</span></th>' + (isRTL ? thead : '');
+                                       thead += '<th' + ((dow + firstDay + 6) % 7 >= 5 ? ' class="ui-datepicker-week-end"' : '') + '>' +
+                                               '<span title="' + dayNames[day] + '">' + dayNamesMin[day] + '</span></th>';
                                }
                                calender += thead + '</tr></thead><tbody>';
                                var daysInMonth = this._getDaysInMonth(drawYear, drawMonth);
@@ -1362,7 +1362,7 @@ $.extend(Datepicker.prototype, {
                                                var otherMonth = (printDate.getMonth() != drawMonth);
                                                var unselectable = otherMonth || !daySettings[0] ||
                                                        (minDate && printDate < minDate) || (maxDate && printDate > maxDate);
-                                               tbody = (isRTL ? '' : tbody) + '<td class="' +
+                                               tbody += '<td class="' +
                                                        ((dow + firstDay + 6) % 7 >= 5 ? ' ui-datepicker-week-end' : '') + // highlight weekends
                                                        (otherMonth ? ' ui-datepicker-other-month' : '') + // highlight days from other months
                                                        ((printDate.getTime() == selectedDate.getTime() && drawMonth == inst.selectedMonth && inst._keyEvent) || // user pressed key
@@ -1382,8 +1382,7 @@ $.extend(Datepicker.prototype, {
                                                        (printDate.getTime() == today.getTime() ? ' ui-state-highlight' : '') + 
                                                        (printDate.getTime() >= currentDate.getTime() && printDate.getTime() <= endDate.getTime() ? // in current range
                                                        ' ui-state-active' : '') + // highlight selected day                                                    
-                                                       '" href="#">' + printDate.getDate() + '</a>')) + '</td>' + // display for this month
-                                                       (isRTL ? tbody : '');
+                                                       '" href="#">' + printDate.getDate() + '</a>')) + '</td>'; // display for this month
                                                printDate.setDate(printDate.getDate() + 1);
                                                printDate = this._daylightSavingAdjust(printDate);
                                        }
@@ -1395,7 +1394,7 @@ $.extend(Datepicker.prototype, {
                                        drawYear++;
                                }
                                calender += '</tbody></table>' + (isMultiMonth ? '</div>' : '');
-                               group = (isRTL ? calender + group : group + calender );
+                               group += calender;
                        }
                        html += group;
                }