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

Allow reverting edition of addressbook name w/ESC

pull/91/head
Francis Lachapelle 2014-10-07 14:54:12 -04:00
parent 4457997276
commit f7df4c1fa0
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -167,7 +167,7 @@
<div class="newItemsToolbar">
<a class="button tiny radius split" data-ui-sref="addressbook.new({addressbookId: addressbook.id, contactType: 'card'})"><var:string label:value="New Card"/><span data-dropdown-toggle="#newListDrop"></span></a><br/>
</div>
<ul id="contactFolders">
<ul>
<li data-ng-repeat="folder in addressbooks"
data-ng-class="{_selected: addressbook.id==folder.id}"
data-ng-dblclick="edit($index)">
@ -181,7 +181,9 @@
data-ng-model="folder.name"
data-ng-show="editMode==folder.id"
data-ng-cloak="ng-cloak"
data-sg-focus-on="addressBookName_{{$index}}"/>
data-ng-blur="save($index)"
data-sg-focus-on="addressBookName_{{$index}}"
data-sg-escape="revertEditing($index)"/>
</form>
<span class="icon" data-ng-cloak="ng-cloak"><a class="icon" href="#" data-dropdown-toggle="#addressbookProperties" data-options="align:right" data-ng-show="addressbook.id==folder.id"><i class="icon-cog"><!-- options --></i></a></span>
</li>
@ -243,7 +245,7 @@
<div id="contactView" data-ui-view="card"><!-- card state view --></div>
</div>
</script>
</script><!-- addressbooks.html -->
<script type="text/ng-template" id="card.html">

5
UI/WebServerResources/js/ContactsUI.js
View File

@ -138,9 +138,14 @@
i = _.indexOf(_.pluck($scope.addressbooks, 'id'), $rootScope.addressbook.id);
}
$scope.editMode = $rootScope.addressbook.id;
$scope.originalAddressbook = angular.extend({}, $scope.addressbook.$omit());
focus('addressBookName_' + i);
}
};
$scope.revertEditing = function(i) {
$scope.addressbooks[i].name = $scope.originalAddressbook.name;
$scope.editMode = false;
};
$scope.save = function(i) {
var name = $scope.addressbooks[i].name;
if (name && name.length > 0) {