brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

calendar: Fix prev/next buttons to not skip months

Browse Source 
When the current day does not exist in the next/prev month (like 31 Feb),
the next/prev buttons end up skipping the month.

Fix that by going to the last day of the month instead.

https://bugzilla.gnome.org/show_bug.cgi?id=641067
This commit is contained in:
Adel Gadllah 2011-01-31 21:00:16 +01:00
parent d9e778f501
commit 8fea88879a
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
js/ui/calendar.js
View File

@ -488,23 +488,45 @@ Calendar.prototype = {
_onPrevMonthButtonClicked: function() { _onPrevMonthButtonClicked: function() {
let newDate = new Date(this._selectedDate); let newDate = new Date(this._selectedDate);
if (newDate.getMonth() == 0) { let oldMonth = newDate.getMonth();
if (oldMonth == 0) {
newDate.setMonth(11); newDate.setMonth(11);
newDate.setFullYear(newDate.getFullYear() - 1); newDate.setFullYear(newDate.getFullYear() - 1);
} else { if (newDate.getMonth() != 11) {
newDate.setMonth(newDate.getMonth() - 1); let day = 32 - new Date(newDate.getFullYear() - 1, 11, 32).getDate();
newDate = new Date(newDate.getFullYear() - 1, 11, day);
} }
}
else {
newDate.setMonth(oldMonth - 1);
if (newDate.getMonth() != oldMonth - 1) {
let day = 32 - new Date(newDate.getFullYear(), oldMonth - 1, 32).getDate();
newDate = new Date(newDate.getFullYear(), oldMonth - 1, day);
}
}
this.setDate(newDate); this.setDate(newDate);
}, },
_onNextMonthButtonClicked: function() { _onNextMonthButtonClicked: function() {
let newDate = new Date(this._selectedDate); let newDate = new Date(this._selectedDate);
if (newDate.getMonth() == 11) { let oldMonth = newDate.getMonth();
if (oldMonth == 11) {
newDate.setMonth(0); newDate.setMonth(0);
newDate.setFullYear(newDate.getFullYear() + 1); newDate.setFullYear(newDate.getFullYear() + 1);
} else { if (newDate.getMonth() != 0) {
newDate.setMonth(newDate.getMonth() + 1); let day = 32 - new Date(newDate.getFullYear() + 1, 0, 32).getDate();
newDate = new Date(newDate.getFullYear() + 1, 0, day);
} }
}
else {
newDate.setMonth(oldMonth + 1);
if (newDate.getMonth() != oldMonth + 1) {
let day = 32 - new Date(newDate.getFullYear(), oldMonth + 1, 32).getDate();
newDate = new Date(newDate.getFullYear(), oldMonth + 1, day);
}
}
this.setDate(newDate); this.setDate(newDate);
}, },