bugfix: ensure expandedDate is the right month

angusmcleod · Dec 14, 2018 · 802d861 · 802d861
1 parent 8b356e3
commit 802d861
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/assets/javascripts/discourse/components/events-calendar-body.js.es6 b/assets/javascripts/discourse/components/events-calendar-body.js.es6
@@ -3,7 +3,7 @@ import { firstDayOfWeek } from '../lib/date-utilities';
 
 export default Ember.Component.extend({
   classNames: 'events-calendar-body',
-  expandedDate: 0,
+  expandedDate: 0.0,
 
   @on('init')
   setup() {
@@ -32,7 +32,8 @@ export default Ember.Component.extend({
     },
 
     setExpandedDate(date) {
-      this.set('expandedDate', date);
+      const month = this.get('currentMonth');
+      this.set('expandedDate', month + '.' + date);
     }
   }
 });
diff --git a/assets/javascripts/discourse/components/events-calendar-day.js.es6 b/assets/javascripts/discourse/components/events-calendar-day.js.es6
@@ -8,9 +8,9 @@ export default Ember.Component.extend({
   hidden: 0,
   hasHidden: Ember.computed.gt('hidden', 0),
 
-  @computed('date', 'expandedDate')
-  expanded(date, expandedDate) {
-    return date === expandedDate;
+  @computed('date', 'month', 'expandedDate')
+  expanded(date, month, expandedDate) {
+    return `${month}.${date}` === expandedDate;
   },
 
   @computed('month', 'currentMonth')