Merge branch 'master' into production

nhn · Sep 30, 2021 · 3670b8e · 3670b8e
2 parents 2cb6ec6 + 991c764
commit 3670b8e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 22 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tui-date-picker",
-  "version": "4.3.0",
+  "version": "4.3.1",
   "description": "TOAST UI Components: DatePicker",
   "main": "dist/tui-date-picker",
   "types": "index.d.ts",

diff --git a/src/js/calendar/header.js b/src/js/calendar/header.js
@@ -29,8 +29,6 @@ var SELECTOR_INNER_ELEM = '.tui-calendar-header-inner';
 var SELECTOR_INFO_ELEM = '.tui-calendar-header-info';
 var SELECTOR_BTN = '.tui-calendar-btn';
 
-var TODAY_TITLE_ELEM = '.tui-calendar-title-today';
-
 var YEAR_TITLE_FORMAT = 'yyyy';
 
 /**
@@ -144,8 +142,6 @@ var Header = defineClass(
 
       if (closest(target, SELECTOR_BTN)) {
         this.fire('click', ev);
-      } else if (closest(target, TODAY_TITLE_ELEM)) {
-        this.fire('today');
       }
     },
 

diff --git a/src/js/datepicker/index.js b/src/js/datepicker/index.js
@@ -43,6 +43,7 @@ var CLASS_NAME_NEXT_MONTH_BTN = constants.CLASS_NAME_NEXT_MONTH_BTN;
 var CLASS_NAME_PREV_YEAR_BTN = constants.CLASS_NAME_PREV_YEAR_BTN;
 var CLASS_NAME_PREV_MONTH_BTN = constants.CLASS_NAME_PREV_MONTH_BTN;
 var CLASS_NAME_SELECTED = constants.CLASS_NAME_SELECTED;
+var CLASS_NAME_TITLE_TODAY = constants.CLASS_NAME_TITLE_TODAY;
 
 var CLASS_NAME_SELECTABLE = 'tui-is-selectable';
 var CLASS_NAME_BLOCKED = 'tui-is-blocked';
@@ -353,7 +354,6 @@ var DatePicker = defineClass(
     _setEvents: function() {
       mouseTouchEvent.on(this._element, 'click', this._onClickHandler, this);
       this._calendar.on('draw', this._onDrawCalendar, this);
-      this._calendar._header.on('today', this._onClickTodayHandler, this);
     },
 
     /**
@@ -648,10 +648,13 @@ var DatePicker = defineClass(
      */
     _onClickHandler: function(ev) {
       var target = util.getTarget(ev);
-      ev.preventDefault();
 
       if (closest(target, '.' + CLASS_NAME_SELECTABLE)) {
+        ev.preventDefault();
         this._updateDate(target);
+      } else if (closest(target, '.' + CLASS_NAME_TITLE_TODAY)) {
+        ev.preventDefault();
+        this._updateDateToToday();
       } else if (closest(target, SELECTOR_CALENDAR_TITLE)) {
         this.drawUpperCalendar(this._date);
       } else if (closest(target, '.' + CLASS_NAME_SELECTOR_BUTTON)) {
@@ -660,11 +663,10 @@ var DatePicker = defineClass(
     },
 
     /**
-     * Event handler for click of today text
-     * @param {Event} ev An event object
+     * Update date to today
      * @private
      */
-    _onClickTodayHandler: function() {
+    _updateDateToToday: function() {
       this.setDate(Date.now());
       this.close();
     },

diff --git a/test/calendar/header.spec.js b/test/calendar/header.spec.js
@@ -11,7 +11,6 @@ var CLASS_NAME_NEXT_MONTH_BTN = constants.CLASS_NAME_NEXT_MONTH_BTN;
 var CLASS_NAME_NEXT_YEAR_BTN = constants.CLASS_NAME_NEXT_YEAR_BTN;
 var CLASS_NAME_PREV_MONTH_BTN = constants.CLASS_NAME_PREV_MONTH_BTN;
 var CLASS_NAME_PREV_YEAR_BTN = constants.CLASS_NAME_PREV_YEAR_BTN;
-var CLASS_NAME_TITLE_TODAY = constants.CLASS_NAME_TITLE_TODAY;
 
 describe('Calendar', function() {
   describe('Header', function() {
@@ -75,19 +74,10 @@ describe('Calendar', function() {
       expect(spy).toHaveBeenCalled();
     });
 
-    it('should fire "today" custom event when click today text', function() {
-      var spy = jest.fn();
-      header.on('today', spy);
-
-      clickBtnInHeader(CLASS_NAME_TITLE_TODAY);
-      expect(spy).toHaveBeenCalled();
-    });
-
     it('should be able to destroy', function() {
       var nContainer = document.createElement('div');
       var nHeader = new Header(nContainer, {
-        language: 'en',
-        showToday: true
+        language: 'en'
       });
 
       nHeader.render();