From 361a84e7b5ac6b40a016bb2607818428ea6b12bc Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 7 Aug 2019 16:33:51 -0400 Subject: [PATCH] (js) Avoid saving an empty calendar name --- NEWS | 3 +++ UI/WebServerResources/js/Contacts/AddressBooksController.js | 3 +++ .../js/Scheduler/sgCalendarListItem.directive.js | 3 +++ 3 files changed, 9 insertions(+) diff --git a/NEWS b/NEWS index 0eb0d17c5..45570f1b7 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,9 @@ 4.0.9 (2019-XX-XX) ------------------ +Enhancements + - [web] avoid saving an empty calendar name + Bug fixes - [web] properly handle Windows-1256 charaset (#4781) diff --git a/UI/WebServerResources/js/Contacts/AddressBooksController.js b/UI/WebServerResources/js/Contacts/AddressBooksController.js index 1def6f84b..dd8fe182f 100644 --- a/UI/WebServerResources/js/Contacts/AddressBooksController.js +++ b/UI/WebServerResources/js/Contacts/AddressBooksController.js @@ -106,6 +106,9 @@ this.editMode = false; } } + else { + this.revertEditing(folder); + } }; this.confirmDelete = function () { diff --git a/UI/WebServerResources/js/Scheduler/sgCalendarListItem.directive.js b/UI/WebServerResources/js/Scheduler/sgCalendarListItem.directive.js index 046965d54..c97671a5e 100644 --- a/UI/WebServerResources/js/Scheduler/sgCalendarListItem.directive.js +++ b/UI/WebServerResources/js/Scheduler/sgCalendarListItem.directive.js @@ -107,6 +107,9 @@ if (this.inputElement.disabled) return; + if (this.inputElement.value.length === 0) + this.revertEditing(); + this.calendar.name = this.inputElement.value; this.inputElement.disabled = true; this.calendar.$rename()