fix(weekView): ensure events are always ordered by start date

Closes #443
mattlewis92 · Sep 10, 2016 · 419626e · 419626e
1 parent 91e7c3b
commit 419626e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
     "angular": ">=1.3.0",
     "angular-mocks": ">=1.3.0",
     "bootstrap": "^3.3.6",
-    "calendar-utils": "0.0.23",
+    "calendar-utils": "0.0.25",
     "commitizen": "~2.8.1",
     "concurrently": "~2.2.0",
     "conventional-changelog": "~1.1.0",

diff --git a/src/services/calendarHelper.js b/src/services/calendarHelper.js
@@ -184,8 +184,8 @@ angular
           var weekViewStart = moment(startOfWeek).startOf('day');
 
           var eventPeriod = getRecurringEventPeriod({
-            start: moment(event.startsAt).startOf('day'),
-            end: moment(event.endsAt || event.startsAt).startOf('day').add(1, 'second')
+            start: moment(event.startsAt),
+            end: moment(event.endsAt || event.startsAt).add(1, 'second')
           }, event.recursOn, weekViewStart);
 
           eventPeriod.originalEvent = event;