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

calendar: Simplify code a bit

Browse Source 
Just make the error case the same as the no-appointments one.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/626
This commit is contained in:
Florian Müllner 2019-07-12 05:25:54 +02:00 committed by Georges Basile Stavracas Neto
parent c765082f72
commit 2ff7a78b56
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
js/ui/calendar.js
View File

@ -237,20 +237,18 @@ var DBusEventSource = class DBusEventSource {
_onEventsReceived(results, error) { _onEventsReceived(results, error) {
let newEvents = []; let newEvents = [];
let appointments = results[0] || null; let appointments = results[0] || [];
if (appointments != null) { for (let n = 0; n < appointments.length; n++) {
for (let n = 0; n < appointments.length; n++) { let a = appointments[n];
let a = appointments[n]; let date = new Date(a[4] * 1000);
let date = new Date(a[4] * 1000); let end = new Date(a[5] * 1000);
let end = new Date(a[5] * 1000); let id = a[0];
let id = a[0]; let summary = a[1];
let summary = a[1]; let allDay = a[3];
let allDay = a[3]; let event = new CalendarEvent(id, date, end, summary, allDay);
let event = new CalendarEvent(id, date, end, summary, allDay); newEvents.push(event);
newEvents.push(event);
}
newEvents.sort((ev1, ev2) => ev1.date.getTime() - ev2.date.getTime());
} }
newEvents.sort((ev1, ev2) => ev1.date.getTime() - ev2.date.getTime());
this._events = newEvents; this._events = newEvents;
this.isLoading = false; this.isLoading = false;