Merge pull request #419 from nhn/fix/issue-416

fix: when changing timzone, today display issue(fix #416)
nhn · Oct 2, 2019 · 739e507 · 739e507
2 parents 5a170cc + 2be914b
commit 739e507
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/js/view/week/dayGrid.js b/src/js/view/week/dayGrid.js
@@ -87,6 +87,7 @@ DayGrid.prototype.getBaseViewModel = function(viewModel) {
         styles = this._getStyles(viewModel.theme, timezonesCollapsed);
 
     var baseViewModel, visibleScheduleCount;
+    var now = new TZDate().toLocalTime();
 
     if (panel.showExpandableButton) {
         if (!heightForcedSet) {
@@ -115,7 +116,7 @@ DayGrid.prototype.getBaseViewModel = function(viewModel) {
         days: util.map(viewModel.range, function(d, index) {
             var day = d.getDay();
             var ymd = datetime.format(d, 'YYYYMMDD');
-            var isToday = datetime.isSameDate(d, new TZDate());
+            var isToday = datetime.isSameDate(now, d);
 
             return {
                 day: day,

diff --git a/src/js/view/week/dayname.js b/src/js/view/week/dayname.js
@@ -54,7 +54,7 @@ util.inherit(DayName, View);
 DayName.prototype._getBaseViewModel = function(start, end, grids) {
     var daynames = this.options.daynames,
         theme = this.theme,
-        now = new TZDate(),
+        now = new TZDate().toLocalTime(),
         viewModel;
 
     viewModel = util.map(datetime.range(

diff --git a/src/js/view/weekday.js b/src/js/view/weekday.js
@@ -76,11 +76,11 @@ Weekday.prototype.getRenderDateGrids = function() {
 Weekday.prototype.getBaseViewModel = function(viewModel) {
     var opt = this.options;
     var range = viewModel.range;
-    var today = datetime.format(new TZDate(), 'YYYYMMDD');
     var gridWidth = (100 / range.length);
     var grids = viewModel.grids;
     var exceedDate = viewModel.exceedDate || {};
     var theme = viewModel.theme;
+    var now = new TZDate().toLocalTime();
 
     this._cacheParentViewModel = viewModel;
 
@@ -91,8 +91,8 @@ Weekday.prototype.getBaseViewModel = function(viewModel) {
         scheduleBlockGutter: opt.scheduleGutter,
         dates: util.map(range, function(date, index) {
             var day = date.getDay();
-            var ymd = datetime.format(date, 'YYYYMMDD');
-            var isToday = ymd === today;
+            var ymd = datetime.format(new TZDate(date), 'YYYYMMDD');
+            var isToday = datetime.isSameDate(now, date);
 
             return {
                 date: datetime.format(date, 'YYYY-MM-DD'),