diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
index a818a4fd2..85f101147 100644
--- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox
+++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
@@ -56,7 +56,7 @@
sg-drop="app.dragSelectedCards(dragFolder, folder, dragMode)">
contacts
+ ng-show="app.editMode != folder.id">
{{folder.name}}
{{folder.name}}
@@ -144,7 +144,7 @@
sg-drop="app.dragSelectedCards(dragFolder, folder, dragMode)">
contacts
+ ng-show="app.editMode != folder.id">
{{folder.name}}
{{folder.name}}
diff --git a/UI/WebServerResources/js/Contacts/AddressBooksController.js b/UI/WebServerResources/js/Contacts/AddressBooksController.js
index 19e7568fd..959de1f1f 100644
--- a/UI/WebServerResources/js/Contacts/AddressBooksController.js
+++ b/UI/WebServerResources/js/Contacts/AddressBooksController.js
@@ -65,10 +65,6 @@
$mdSidenav('left').close();
$state.go('app.addressbook', {addressbookId: folder.id});
}
- else {
- $event.preventDefault();
- $event.stopPropagation();
- }
}
function newAddressbook() {
@@ -102,13 +98,18 @@
function save(folder) {
var name = folder.name;
- if (name && name.length > 0 && name != vm.originalAddressbook.name) {
- folder.$rename(name)
- .then(function(data) {
- vm.editMode = false;
- }, function(data, status) {
- Dialog.alert(l('Warning'), data);
- });
+ if (name && name.length > 0) {
+ if (name != vm.originalAddressbook.name) {
+ folder.$rename(name)
+ .then(function(data) {
+ vm.editMode = false;
+ }, function(data, status) {
+ Dialog.alert(l('Warning'), data);
+ });
+ }
+ else {
+ vm.editMode = false;
+ }
}
}