LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(js) Improve rename of address book 

Fixes impossibility to insert spaces in address book name.
pull/218/merge
Francis Lachapelle 2017-10-10 14:29:38 -04:00
parent c4be6a2114
commit 888adc9396
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UI/Templates/ContactsUI/UIxContactFoldersView.wox
View File

@ -56,7 +56,7 @@
sg-drop="app.dragSelectedCards(dragFolder, folder, dragMode)">
<md-icon>contacts</md-icon>
<p class="sg-item-name"
ng-show="app.editMode!=folder.id">
ng-show="app.editMode != folder.id">
{{folder.name}}
<md-tooltip md-delay="2000">{{folder.name}}</md-tooltip>
</p>
@ -144,7 +144,7 @@
sg-drop="app.dragSelectedCards(dragFolder, folder, dragMode)">
<md-icon>contacts</md-icon>
<p class="sg-item-name"
ng-show="app.editMode!=folder.id">
ng-show="app.editMode != folder.id">
{{folder.name}}
<md-tooltip md-delay="2000">{{folder.name}}</md-tooltip>
</p>

23
UI/WebServerResources/js/Contacts/AddressBooksController.js
View File

@ -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;
}
}
}