From f7df4c1fa0c3d8971569d3f0204f5c7edcec67e2 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 7 Oct 2014 14:54:12 -0400
Subject: [PATCH] Allow reverting edition of addressbook name w/ESC

---
 UI/Templates/ContactsUI/UIxContactFoldersView.wox | 8 +++++---
 UI/WebServerResources/js/ContactsUI.js            | 5 +++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
index ab571a174..d4bdfcb1e 100644
--- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox
+++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
@@ -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">
 
diff --git a/UI/WebServerResources/js/ContactsUI.js b/UI/WebServerResources/js/ContactsUI.js
index edea07147..4d38ea310 100644
--- a/UI/WebServerResources/js/ContactsUI.js
+++ b/UI/WebServerResources/js/ContactsUI.js
@@ -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) {