(js) Improve rename of address book
Fixes impossibility to insert spaces in address book name.pull/218/merge
parent
c4be6a2114
commit
888adc9396
|
@ -56,7 +56,7 @@
|
||||||
sg-drop="app.dragSelectedCards(dragFolder, folder, dragMode)">
|
sg-drop="app.dragSelectedCards(dragFolder, folder, dragMode)">
|
||||||
<md-icon>contacts</md-icon>
|
<md-icon>contacts</md-icon>
|
||||||
<p class="sg-item-name"
|
<p class="sg-item-name"
|
||||||
ng-show="app.editMode!=folder.id">
|
ng-show="app.editMode != folder.id">
|
||||||
{{folder.name}}
|
{{folder.name}}
|
||||||
<md-tooltip md-delay="2000">{{folder.name}}</md-tooltip>
|
<md-tooltip md-delay="2000">{{folder.name}}</md-tooltip>
|
||||||
</p>
|
</p>
|
||||||
|
@ -144,7 +144,7 @@
|
||||||
sg-drop="app.dragSelectedCards(dragFolder, folder, dragMode)">
|
sg-drop="app.dragSelectedCards(dragFolder, folder, dragMode)">
|
||||||
<md-icon>contacts</md-icon>
|
<md-icon>contacts</md-icon>
|
||||||
<p class="sg-item-name"
|
<p class="sg-item-name"
|
||||||
ng-show="app.editMode!=folder.id">
|
ng-show="app.editMode != folder.id">
|
||||||
{{folder.name}}
|
{{folder.name}}
|
||||||
<md-tooltip md-delay="2000">{{folder.name}}</md-tooltip>
|
<md-tooltip md-delay="2000">{{folder.name}}</md-tooltip>
|
||||||
</p>
|
</p>
|
||||||
|
|
|
@ -65,10 +65,6 @@
|
||||||
$mdSidenav('left').close();
|
$mdSidenav('left').close();
|
||||||
$state.go('app.addressbook', {addressbookId: folder.id});
|
$state.go('app.addressbook', {addressbookId: folder.id});
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
$event.preventDefault();
|
|
||||||
$event.stopPropagation();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function newAddressbook() {
|
function newAddressbook() {
|
||||||
|
@ -102,13 +98,18 @@
|
||||||
|
|
||||||
function save(folder) {
|
function save(folder) {
|
||||||
var name = folder.name;
|
var name = folder.name;
|
||||||
if (name && name.length > 0 && name != vm.originalAddressbook.name) {
|
if (name && name.length > 0) {
|
||||||
folder.$rename(name)
|
if (name != vm.originalAddressbook.name) {
|
||||||
.then(function(data) {
|
folder.$rename(name)
|
||||||
vm.editMode = false;
|
.then(function(data) {
|
||||||
}, function(data, status) {
|
vm.editMode = false;
|
||||||
Dialog.alert(l('Warning'), data);
|
}, function(data, status) {
|
||||||
});
|
Dialog.alert(l('Warning'), data);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
vm.editMode = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue