From e217234f9e03340a52a16ec530f7f0bb54884ec8 Mon Sep 17 00:00:00 2001 From: Albert Gasset Date: Fri, 9 Aug 2019 13:09:07 +0200 Subject: [PATCH] MOBILE-3087 calendar: Fix offline events not displayed in upcoming events page --- .../calendar/components/upcoming-events/upcoming-events.ts | 2 +- src/addon/calendar/providers/calendar.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/addon/calendar/components/upcoming-events/upcoming-events.ts b/src/addon/calendar/components/upcoming-events/upcoming-events.ts index d540dae6e..74db1aebc 100644 --- a/src/addon/calendar/components/upcoming-events/upcoming-events.ts +++ b/src/addon/calendar/components/upcoming-events/upcoming-events.ts @@ -264,7 +264,7 @@ export class AddonCalendarUpcomingEventsComponent implements OnInit, OnChanges, return this.onlineEvents; } - const start = Date.now(), + const start = Date.now() / 1000, end = start + (CoreConstants.SECONDS_DAY * this.lookAhead); let result = this.onlineEvents; diff --git a/src/addon/calendar/providers/calendar.ts b/src/addon/calendar/providers/calendar.ts index 5ffe6d29d..7b09df4a8 100644 --- a/src/addon/calendar/providers/calendar.ts +++ b/src/addon/calendar/providers/calendar.ts @@ -727,7 +727,7 @@ export class AddonCalendarProvider { return this.userProvider.getUserPreference('calendar_lookahead').catch((error) => { // Ignore errors. }).then((value): any => { - if (typeof value != 'undefined') { + if (value != null) { return value; }