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

calendar: Minor cleanup

Browse Source 
As the design calls for slightly different behavior for the current
day, move the _isToday() function out of MessageListSection to have
it available elsewhere as well ...

https://bugzilla.gnome.org/show_bug.cgi?id=744927
This commit is contained in:
Florian Müllner 2015-03-11 22:36:00 +01:00
parent e4ad31a5dd
commit d48d787c1e
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
js/ui/calendar.js
View File

@ -44,6 +44,10 @@ function _sameDay(dateA, dateB) {
return _sameMonth(dateA, dateB) && (dateA.getDate() == dateB.getDate()); return _sameMonth(dateA, dateB) && (dateA.getDate() == dateB.getDate());
} }
function _isToday(date) {
return _sameDay(new Date(), date);
}
function _isWorkDay(date) { function _isWorkDay(date) {
/* Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday). */ /* Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday). */
let days = C_('calendar-no-work', "06"); let days = C_('calendar-no-work', "06");
@ -1412,11 +1416,6 @@ const MessageListSection = new Lang.Class({
return false; return false;
}, },
_isToday: function() {
let today = new Date();
return _sameDay(this._date, today);
},
_shouldShow: function() { _shouldShow: function() {
return !this.empty; return !this.empty;
}, },
@ -1461,13 +1460,13 @@ const EventsSection = new Lang.Class({
}, },
_updateTitle: function() { _updateTitle: function() {
let now = new Date(); if (_isToday(this._date)) {
if (_sameDay(this._date, now)) {
this._title.label = _("Events"); this._title.label = _("Events");
return; return;
} }
let dayFormat; let dayFormat;
let now = new Date();
if (_sameYear(this._date, now)) if (_sameYear(this._date, now))
/* Translators: Shown on calendar heading when selected day occurs on current year */ /* Translators: Shown on calendar heading when selected day occurs on current year */
dayFormat = Shell.util_translate_time_string(NC_("calendar heading", dayFormat = Shell.util_translate_time_string(NC_("calendar heading",
@ -1551,7 +1550,7 @@ const EventsSection = new Lang.Class({
}, },
_shouldShow: function() { _shouldShow: function() {
return !this.empty || !this._isToday(); return !this.empty || !_isToday(this._date);
}, },
_sync: function() { _sync: function() {
@ -1670,7 +1669,7 @@ const NotificationSection = new Lang.Class({
}, },
_shouldShow: function() { _shouldShow: function() {
return !this.empty && this._isToday(); return !this.empty && _isToday(this._date);
}, },
_sync: function() { _sync: function() {
@ -1710,7 +1709,7 @@ const Placeholder = new Lang.Class({
}, },
_sync: function() { _sync: function() {
let isToday = _sameDay(this._date, new Date()); let isToday = _isToday(this._date);
if (isToday && this._icon.gicon == this._todayIcon) if (isToday && this._icon.gicon == this._todayIcon)
return; return;
if (!isToday && this._icon.gicon == this._otherIcon) if (!isToday && this._icon.gicon == this._otherIcon)