From 2c7acd22342bc46145103eece307a3b24c3d782a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B8=D0=BB=D1=8F=D0=BD=20=D0=9F=D0=B0=D0=BB=D0=B0?= =?UTF-8?q?=D1=83=D0=B7=D0=BE=D0=B2?= Date: Fri, 29 May 2020 02:13:38 +0000 Subject: [PATCH] refactor : Remove not needed util.bind (#608) refactor : Remove not needed util.bind (#608) refactor: remove unused this.ratio --- src/js/handler/daygrid/core.js | 43 ++++++----------- src/js/handler/daygrid/creation.js | 5 +- src/js/handler/month/guide.js | 12 +---- src/js/handler/time/core.js | 59 +++++++++++------------- src/js/handler/time/creation.js | 5 +- src/js/view/popup/scheduleDetailPopup.js | 2 +- 6 files changed, 46 insertions(+), 80 deletions(-) diff --git a/src/js/handler/daygrid/core.js b/src/js/handler/daygrid/core.js index a85b0eb18..b8794ccd4 100644 --- a/src/js/handler/daygrid/core.js +++ b/src/js/handler/daygrid/core.js @@ -74,10 +74,11 @@ var dayGridCore = { /** * @param {view} view - view instance. * @param {TZDate} startDate - start date - * @returns {function|boolean} function that return schedule data by mouse events. + * @returns {object} schedule data by mouse events. */ _retriveScheduleDataFromDate: function(view, startDate) { var weekdayView = view.children.single(), + xIndex = 0, datesInRange, dragStartXIndex = 0, grids, @@ -93,36 +94,22 @@ var dayGridCore = { util.forEach(range, function(date, index) { if (datetime.isSameDate(date, startDate)) { - dragStartXIndex = index; + xIndex = dragStartXIndex = index; } }); - /** - * @param {TZDate} targetDate - target date - * @returns {object} schedule data. - */ - return function(targetDate) { - var xIndex = 0; - - util.forEach(range, function(date, index) { - if (datetime.isSameDate(date, targetDate)) { - xIndex = index; - } - }); - - // apply limitation of creation schedule X index. - xIndex = mmax(xIndex, 0); - xIndex = mmin(xIndex, datesInRange - 1); - - return { - relatedView: view, - dragStartXIndex: dragStartXIndex, - datesInRange: datesInRange, - xIndex: xIndex, - triggerEvent: 'manual', - grids: grids, - range: range - }; + // apply limitation of creation schedule X index. + xIndex = mmax(xIndex, 0); + xIndex = mmin(xIndex, datesInRange - 1); + + return { + relatedView: view, + dragStartXIndex: dragStartXIndex, + datesInRange: datesInRange, + xIndex: xIndex, + triggerEvent: 'manual', + grids: grids, + range: range }; } }; diff --git a/src/js/handler/daygrid/creation.js b/src/js/handler/daygrid/creation.js index 8c3db61ad..939341dbb 100644 --- a/src/js/handler/daygrid/creation.js +++ b/src/js/handler/daygrid/creation.js @@ -322,10 +322,7 @@ DayGridCreation.prototype._onDblClick = function(clickEventData) { * @param {Schedule} schedule - schedule instance */ DayGridCreation.prototype.invokeCreationClick = function(schedule) { - var getScheduleDataFunc, scheduleData; - - getScheduleDataFunc = this._retriveScheduleDataFromDate(this.view, schedule.start); - scheduleData = getScheduleDataFunc(schedule.start); + var scheduleData = this._retriveScheduleDataFromDate(this.view, schedule.start); this.fire('click', scheduleData); diff --git a/src/js/handler/month/guide.js b/src/js/handler/month/guide.js index 5ea528ed8..c06eead45 100644 --- a/src/js/handler/month/guide.js +++ b/src/js/handler/month/guide.js @@ -6,7 +6,6 @@ var util = require('tui-code-snippet'); var config = require('../../config'), - common = require('../../common/common'), domutil = require('../../common/domutil'), datetime = require('../../common/datetime'), TZDate = require('../../common/timezone').Date, @@ -25,8 +24,6 @@ var mmax = Math.max, * @param {Month} monthView - Month view instance */ function MonthGuide(options, monthView) { - var self = this; - /** * @type {object} */ @@ -57,13 +54,6 @@ function MonthGuide(options, monthView) { */ this.days = monthView.children.single().getRenderDateRange().length; - /** - * @type {function} - */ - this.ratio = util.bind(function(value) { - return common.ratio(self.days, 100, value); - }); - /** * start coordinate of guide effect. (x, y) (days, weeks) effect can't * start lower than this coordinate. @@ -90,7 +80,7 @@ MonthGuide.prototype.destroy = function() { this.clear(); this.options = this.view = this.weeks = this.days = - this.ratio = this.startCoord = this.guideElements = null; + this.startCoord = this.guideElements = null; }; MonthGuide.prototype.clearGuideElement = function() { diff --git a/src/js/handler/time/core.js b/src/js/handler/time/core.js index 1bbe7f20e..09eeeb6ac 100644 --- a/src/js/handler/time/core.js +++ b/src/js/handler/time/core.js @@ -51,7 +51,7 @@ var timeCore = { * @param {object} [extend] - object to extend event data before return. * @returns {object} - common event data for time.* */ - return util.bind(function(mouseEvent, extend) { + return function(mouseEvent, extend) { var mouseY = Point.n(domevent.getMousePosition(mouseEvent, container)).y, gridY = common.ratio(viewHeight, hourLength, mouseY), timeY = new TZDate(viewTime).addMinutes(datetime.minutesFromHours(gridY)), @@ -71,47 +71,40 @@ var timeCore = { nearestGridTimeY: nearestGridTimeY, triggerEvent: mouseEvent.type }, extend); - }, this); + }; }, /** * Get function to makes event data from Time and mouseEvent * @param {Time} timeView - Instance of time view. - * @param {number} xIndex - Time view index - * @returns {function} - Function that return event data from mouse event. + * @param {TZDate} startDate - start date + * @param {TZDate} endDate - end date + * @param {number} hourStart Can limit of render hour start. + * @returns {object} - common event data for time.* from mouse event. */ - _retriveScheduleDataFromDate: function(timeView) { + _retriveScheduleDataFromDate: function(timeView, startDate, endDate, hourStart) { var viewTime = timeView.getDate(); + var gridY, timeY, nearestGridY, nearestGridTimeY, nearestGridEndY, nearestGridEndTimeY; - /** - * @param {TZDate} startDate - start date - * @param {TZDate} endDate - end date - * @param {number} hourStart Can limit of render hour start. - * @returns {object} - common event data for time.* - */ - return util.bind(function(startDate, endDate, hourStart) { - var gridY, timeY, nearestGridY, nearestGridTimeY, nearestGridEndY, nearestGridEndTimeY; - - gridY = startDate.getHours() - hourStart + getNearestHour(startDate.getMinutes()); - timeY = new TZDate(viewTime).addMinutes(datetime.minutesFromHours(gridY)); - nearestGridY = gridY; - nearestGridTimeY = new TZDate(viewTime).addMinutes(datetime.minutesFromHours(nearestGridY)); - nearestGridEndY = endDate.getHours() - hourStart + getNearestHour(endDate.getMinutes()); - nearestGridEndTimeY = new TZDate(viewTime).addMinutes(datetime.minutesFromHours(nearestGridEndY)); + gridY = startDate.getHours() - hourStart + getNearestHour(startDate.getMinutes()); + timeY = new TZDate(viewTime).addMinutes(datetime.minutesFromHours(gridY)); + nearestGridY = gridY; + nearestGridTimeY = new TZDate(viewTime).addMinutes(datetime.minutesFromHours(nearestGridY)); + nearestGridEndY = endDate.getHours() - hourStart + getNearestHour(endDate.getMinutes()); + nearestGridEndTimeY = new TZDate(viewTime).addMinutes(datetime.minutesFromHours(nearestGridEndY)); - return util.extend({ - target: timeView, - relatedView: timeView, - gridY: gridY, - timeY: timeY, - nearestGridY: nearestGridY, - nearestGridTimeY: nearestGridTimeY, - nearestGridEndY: nearestGridEndY, - nearestGridEndTimeY: nearestGridEndTimeY, - triggerEvent: 'manual', - hourStart: hourStart - }); - }, this); + return { + target: timeView, + relatedView: timeView, + gridY: gridY, + timeY: timeY, + nearestGridY: nearestGridY, + nearestGridTimeY: nearestGridTimeY, + nearestGridEndY: nearestGridEndY, + nearestGridEndTimeY: nearestGridEndTimeY, + triggerEvent: 'manual', + hourStart: hourStart + }; }, /** diff --git a/src/js/handler/time/creation.js b/src/js/handler/time/creation.js index 49d924146..cc0e41490 100644 --- a/src/js/handler/time/creation.js +++ b/src/js/handler/time/creation.js @@ -369,7 +369,7 @@ TimeCreation.prototype.invokeCreationClick = function(schedule) { datetime.MILLISECONDS_PER_DAY), hourStart = opt.hourStart, targetDate = schedule.start; - var getScheduleDataFunc, eventData, timeView; + var eventData, timeView; util.forEach(range, function(date, index) { if (datetime.isSameDate(date, targetDate)) { @@ -382,8 +382,7 @@ TimeCreation.prototype.invokeCreationClick = function(schedule) { timeView = this.timeGridView.children.toArray()[0]; } - getScheduleDataFunc = this._retriveScheduleDataFromDate(timeView); - eventData = getScheduleDataFunc(schedule.start, schedule.end, hourStart); + eventData = this._retriveScheduleDataFromDate(timeView, schedule.start, schedule.end, hourStart); this.fire('timeCreationClick', eventData); diff --git a/src/js/view/popup/scheduleDetailPopup.js b/src/js/view/popup/scheduleDetailPopup.js index aba260c27..53daaad59 100644 --- a/src/js/view/popup/scheduleDetailPopup.js +++ b/src/js/view/popup/scheduleDetailPopup.js @@ -1,5 +1,5 @@ /** - * @fileoverview Floating layer for showing detail schedule + * @fileoverview Floating layer for showing detail schedule * @author NHN FE Development Lab */ 'use strict';