fix: resolve setAllDayPeriod logic(fix nhn#662)

d3v53c · Sep 22, 2020 · 5a524e2 · 5a524e2
1 parent 44ebf62
commit 5a524e2
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/karma.conf.js b/karma.conf.js
@@ -61,7 +61,7 @@ function setConfig(defaultConfig, server) {
             'IE9',
             'IE10',
             'IE11',
-            'Edge',
+            // 'Edge',
             'Chrome-WebDriver',
             'Firefox-WebDriver'
             // 'Safari-WebDriver'

diff --git a/src/js/common/datetime.js b/src/js/common/datetime.js
@@ -641,13 +641,15 @@ datetime = {
     hasMultiDates: function(start, end) {
         var diffDays = datetime.getDateDifference(start, end);
         var diffHours = Math.abs(datetime.getHourDifference(start, end));
-        var withinDay = diffDays === -1 && diffHours < 24 && datetime.isStartOfDay(end);
+        var withinDay = Math.abs(diffDays) === 1 && diffHours < 24 && datetime.isStartOfDay(end);
 
         return !datetime.isSameDate(start, end) && !withinDay;
     },
 
     renderEnd: function(start, end) {
-        return datetime.hasMultiDates(start, end) && datetime.isStartOfDay(end) ?
+        var diffDays = datetime.getDateDifference(start, end);
+
+        return Math.abs(diffDays) >= 1 && datetime.isStartOfDay(end) ?
             datetime.convertStartDayToLastDay(end) :
             datetime.end(end);
     }

diff --git a/src/js/model/schedule.js b/src/js/model/schedule.js
@@ -269,8 +269,22 @@ Schedule.prototype.init = function(options) {
 };
 
 Schedule.prototype.setAllDayPeriod = function(start, end) {
-    this.start = datetime.start(new TZDate(start || Date.now()));
-    this.end = datetime.end(new TZDate(end || this.start));
+    // If it is an all-day schedule, only the date information of the string is used.
+    if (util.isString(start) && start.length === 10) {
+        start = datetime.parse(start);
+    } else {
+        start = new TZDate(start || Date.now());
+    }
+
+    if (util.isString(end) && end.length === 10) {
+        end = datetime.parse(end);
+        end.setHours(23, 59, 59);
+    } else {
+        end = new TZDate(end || start);
+    }
+
+    this.start = datetime.start(start);
+    this.end = datetime.renderEnd(start, end);
 };
 
 Schedule.prototype.setTimePeriod = function(start, end) {

diff --git a/test/app/view/weekdayInMonth.spec.js b/test/app/view/weekdayInMonth.spec.js
@@ -55,11 +55,11 @@ describe('view:WeekdayInMonth', function() {
             var viewModel = ScheduleViewModel.create(Schedule.create({
                     title: 'A',
                     isAllDay: true,
-                    start: '2015-05-01T00:00:00',
-                    end: '2015-05-03T23:59:59'
+                    start: '2015-05-01T00:00:00+09:00',
+                    end: '2015-05-03T23:59:59+09:00'
                 })),
                 eventsInDateRange = [[[viewModel]]],
-                ranges = [new TZDate('2015-05-01T00:00:00'), new TZDate('2015-05-02T00:00:00'), new TZDate('2015-05-03T00:00:00')],
+                ranges = [new TZDate('2015-05-01T00:00:00+09:00'), new TZDate('2015-05-02T00:00:00+09:00'), new TZDate('2015-05-03T00:00:00+09:00')],
                 cache = WeekdayInMonth.prototype.getExceedDate(0, eventsInDateRange, ranges);
 
             expect(cache).toEqual({