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

(js) Improve renaming an address book

pull/105/head
Francis Lachapelle 2015-09-24 11:12:02 -04:00
parent e3d3eb171d
commit a6c440d245
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,14 +38,14 @@
</md-subheader>
<md-list>
<md-list-item ng-repeat="folder in app.service.$addressbooks track by folder.id"
ng-click="app.select(folder)"
ng-click="app.select($event, folder)"
ng-dblclick="app.edit(folder)"
ui-sref="app.addressbook({addressbookId: folder.id})"
ui-sref-active="md-default-theme md-background md-bg md-hue-1">
<md-icon>contacts</md-icon>
<p class="sg-item-name"
ng-show="app.editMode!=folder.id">{{folder.name}}</p>
<md-input-container class="md-flex md-tile-content"
<md-input-container class="md-flex"
ng-show="app.editMode == folder.id">
<input class="sg-item-name" type="text"
label:aria-label="Name of the Address Book"
@ -114,14 +114,14 @@
</md-subheader>
<md-list>
<md-list-item ng-repeat="folder in app.service.$subscriptions track by folder.id"
ng-click="app.select(folder)"
ng-click="app.select($event, folder)"
ng-dblclick="app.edit(folder)"
ui-sref="app.addressbook({addressbookId: folder.id})"
ui-sref-active="md-default-theme md-background md-bg md-hue-1">
<md-icon>contacts</md-icon>
<p class="sg-item-name"
ng-show="editMode!=folder.id">{{folder.name}}</p>
<md-input-container class="md-flex md-tile-content"
<md-input-container class="md-flex"
ng-show="app.editMode==folder.id">
<input class="sg-item-name" type="text"
label:aria-label="Name of the Address Book"
@ -160,7 +160,7 @@
</md-subheader>
<md-list>
<md-list-item ng-repeat="folder in app.service.$remotes track by folder.id"
ng-click="app.select(folder)"
ng-click="app.select($event, folder)"
ui-sref="app.addressbook({addressbookId: folder.id})"
ui-sref-active="md-default-theme md-background md-bg md-hue-1">
<md-icon>public</md-icon>

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

@ -24,10 +24,17 @@
vm.share = share;
vm.subscribeToFolder = subscribeToFolder;
function select(folder) {
vm.editMode = false;
AddressBook.$query.value = '';
$state.go('app.addressbook', {addressbookId: folder.id});
function select($event, folder) {
if ($state.params.addressbookId != folder.id &&
vm.editMode != folder.id) {
vm.editMode = false;
AddressBook.$query.value = '';
$state.go('app.addressbook', {addressbookId: folder.id});
}
else {
$event.preventDefault();
$event.stopPropagation();
}
}
function newAddressbook() {