Merge pull request #362 from nhn/fix/day/workweek

Fix/day/workweek
nhn · Jul 29, 2019 · 188b184 · 188b184
2 parents 4afc40b + f1cc8cd
commit 188b184
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 20 deletions.
diff --git a/src/js/factory/calendar.js b/src/js/factory/calendar.js
@@ -1802,10 +1802,6 @@ function _createController(options) {
  * @private
  */
 function _createWeekView(controller, container, dragHandler, options, viewName) {
-    if (viewName === 'day') {
-        _disableDayOptions(options.week);
-    }
-
     return weekViewFactory(
         controller,
         container,
@@ -1851,18 +1847,6 @@ function _setOptionRecurseively(view, func) {
     });
 }
 
-/**
- * disable options for day view
- * @param {WeekOptions} weekOptions - week options to disable
- */
-function _disableDayOptions(weekOptions) {
-    if (!weekOptions) {
-        return;
-    }
-
-    weekOptions.workweek = false;
-}
-
 util.CustomEvents.mixin(Calendar);
 
 module.exports = Calendar;
diff --git a/src/js/factory/weekView.js b/src/js/factory/weekView.js
@@ -85,7 +85,7 @@ var DEFAULT_PANELS = [
 ];
 
 /* eslint-disable complexity*/
-module.exports = function(baseController, layoutContainer, dragHandler, options) {
+module.exports = function(baseController, layoutContainer, dragHandler, options, viewName) {
     var panels = [],
         vpanels = [];
     var weekView, dayNameContainer, dayNameView, vLayoutContainer, vLayout;
@@ -139,7 +139,7 @@ module.exports = function(baseController, layoutContainer, dragHandler, options)
 
     util.extend(options.week, {panels: panels});
 
-    weekView = new Week(null, options.week, layoutContainer, panels);
+    weekView = new Week(null, options.week, layoutContainer, panels, viewName);
     weekView.handler = {
         click: {},
         dayname: {},

diff --git a/src/js/view/week/week.js b/src/js/view/week/week.js
@@ -22,9 +22,10 @@ var View = require('../view');
  * @param {string} [options.cssPrefix] - CSS classname prefix
  * @param {HTMLElement} container The element to use container for this view.
  * @param {object} panels - schedule panels like 'milestone', 'task', 'allday', 'time'
+ * @param {string} viewName - 'week', 'day'
  * @extends {View}
  */
-function Week(controller, options, container, panels) {
+function Week(controller, options, container, panels, viewName) {
     var range;
 
     container = domutil.appendHTMLElement('div', container);
@@ -72,6 +73,10 @@ function Week(controller, options, container, panels) {
     this.state = {
         timezonesCollapsed: this.options.timezonesCollapsed
     };
+
+    if (viewName === 'day') {
+        _disableDayOptions(this.options);
+    }
 }
 
 util.inherit(Week, View);
@@ -209,6 +214,14 @@ Week.prototype._getRenderDateRange = function(baseDate) {
     };
 };
 
+/**
+ * disable options for day view
+ * @param {WeekOptions} options - week options to disable
+ */
+function _disableDayOptions(options) {
+    options.workweek = false;
+}
+
 util.CustomEvents.mixin(Week);
 
 module.exports = Week;
diff --git a/test/app/view/time.spec.js b/test/app/view/time.spec.js
@@ -37,7 +37,7 @@ describe('View/Time', function() {
         });
 
         expect(result.left).toBe(50);
-        expect(result.width).toBe(null);
+        expect(result.width).toBe(0); // change null value to 0 to fit width 100%
     });
 
     it('_getScheduleViewBoundY()', function() {