fix: save new location and new state during schedule update

nhn · Jul 16, 2018 · d5ac9fe · d5ac9fe
1 parent 178f346
commit d5ac9fe
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/examples/js/default.js b/examples/js/default.js
@@ -252,9 +252,9 @@
             bgColor: calendar.bgColor,
             dragBgColor: calendar.bgColor,
             borderColor: calendar.borderColor,
+            location: scheduleData.location,
             raw: {
-                'class': scheduleData.raw['class'],
-                location: scheduleData.raw.location
+                class: scheduleData.raw['class']
             },
             state: scheduleData.state
         };

diff --git a/src/js/controller/base.js b/src/js/controller/base.js
@@ -189,6 +189,14 @@ Base.prototype.updateSchedule = function(schedule, options) {
         schedule.set('isFocused', options.isFocused);
     }
 
+    if (options.location) {
+        schedule.set('location', options.location);
+    }
+
+    if (options.state) {
+        schedule.set('state', options.state);
+    }
+
     this._removeFromMatrix(schedule);
     this._addToMatrix(schedule);
 
@@ -363,7 +371,7 @@ Base.prototype.setTheme = function(theme) {
  * @property {string|number} id - calendar id
  * @property {string} name - calendar name
  * @property {string} color - text color when schedule is displayed
- * @property {string} bgColor - background color schedule is displayed 
+ * @property {string} bgColor - background color schedule is displayed
  * @property {string} borderColor - color of left border or bullet point when schedule is displayed
  * @property {boolean} [checked] - whether to show calendar's schedules or not
  */

diff --git a/src/js/view/popup/scheduleCreationPopup.js b/src/js/view/popup/scheduleCreationPopup.js
@@ -157,7 +157,7 @@ ScheduleCreationPopup.prototype._openDropdownMenuView = function(dropdown) {
 /**
  * If click dropdown menu item, close dropdown menu
  * @param {HTMLElement} target click event target
- * @returns {boolean} whether 
+ * @returns {boolean} whether
  */
 ScheduleCreationPopup.prototype._selectDropdownMenuItem = function(target) {
     var itemClassName = config.classname('dropdown-menu-item');
@@ -287,9 +287,9 @@ ScheduleCreationPopup.prototype._onClickSaveSchedule = function(target) {
             schedule: {
                 calendarId: calendarId,
                 title: title.value,
+                location: location.value,
                 raw: {
-                    class: isPrivate ? 'private' : 'public',
-                    location: location.value
+                    class: isPrivate ? 'private' : 'public'
                 },
                 start: start,
                 end: end,
@@ -312,9 +312,9 @@ ScheduleCreationPopup.prototype._onClickSaveSchedule = function(target) {
         this.fire('beforeCreateSchedule', {
             calendarId: calendarId,
             title: title.value,
+            location: location.value,
             raw: {
-                class: isPrivate ? 'private' : 'public',
-                location: location.value
+                class: isPrivate ? 'private' : 'public'
             },
             start: new TZDate(startDate),
             end: new TZDate(endDate),
@@ -378,7 +378,7 @@ ScheduleCreationPopup.prototype._makeEditModeData = function(viewModel) {
     var id = schedule.id;
     title = schedule.title;
     isPrivate = raw['class'] === 'private';
-    location = raw.location;
+    location = schedule.location;
     startDate = schedule.start;
     endDate = schedule.end;
     isAllDay = schedule.isAllDay;
@@ -402,8 +402,7 @@ ScheduleCreationPopup.prototype._makeEditModeData = function(viewModel) {
         start: startDate,
         end: endDate,
         raw: {
-            location: location,
-            'class': isPrivate ? 'private' : 'public'
+            class: isPrivate ? 'private' : 'public'
         },
         zIndex: this.layer.zIndex + 5,
         isEditMode: this._isEditMode