Don't allow duplicate GCS folder names

UI/WebServerResources/js/Contacts/AddressBook.service.js

@@ -581,15 +581,16 @@
    * @returns a promise of the HTTP operation
    */
   AddressBook.prototype.$rename = function(name) {
-    var i, list;
+    var _this = this, i, list;
 
     list = this.isSubscription? AddressBook.$subscriptions : AddressBook.$addressbooks;
     i = _.indexOf(_.map(list, 'id'), this.id);
-    this.name = name;
-    list.splice(i, 1);
-    AddressBook.$add(this);
 
-    return this.$save();
+    return this.$save().then(function() {
+      list.splice(i, 1);
+      _this.name = name;
+      AddressBook.$add(_this);
+    });
   };
 
   /**

UI/WebServerResources/js/Contacts/AddressBooksController.js

@@ -17,6 +17,7 @@
     vm.edit = edit;
     vm.revertEditing = revertEditing;
     vm.save = save;
+    vm.saving = false;
     vm.confirmDelete = confirmDelete;
     vm.importCards = importCards;
     vm.showLinks = showLinks;
@@ -98,13 +99,18 @@
 
     function save(folder) {
       var name = folder.name;
-      if (name && name.length > 0) {
+      if (!vm.saving && name && name.length > 0) {
         if (name != vm.originalAddressbook.name) {
+          vm.saving = true;
           folder.$rename(name)
             .then(function(data) {
               vm.editMode = false;
-            }, function(data, status) {
-              Dialog.alert(l('Warning'), data);
+            }, function() {
+              revertEditing(folder);
+              vm.editMode = folder.id;
+            })
+            .finally(function() {
+              vm.saving = false;
             });
         }
         else {

UI/WebServerResources/js/Scheduler/Calendar.service.js

@@ -498,18 +498,20 @@
    * @returns a promise of the HTTP operation
    */
   Calendar.prototype.$save = function() {
-    var _this = this;
+    var _this = this,
+        d = Calendar.$q.defer();
 
-    return Calendar.$$resource.save(this.id, this.$omit()).then(function(data) {
+    Calendar.$$resource.save(this.id, this.$omit()).then(function(data) {
       // Make a copy of the data for an eventual reset
       _this.$shadowData = _this.$omit();
-      return data;
+      return d.resolve(data);
     }, function(data) {
-      Calendar.$log.error(JSON.stringify(data, undefined, 2));
       // Restore previous version
       _this.$reset();
-      return data;
+      return d.reject(data);
     });
+
+    return d.promise;
   };
 
   /**

UI/WebServerResources/js/Scheduler/sgCalendarListItem.directive.js

@@ -87,7 +87,7 @@
       this.inputElement.value = this.calendar.name;
       this.clickableElement.classList.add('ng-hide');
       this.inputContainer.classList.remove('ng-hide');
-      if ($event.srcEvent.type == 'touchend') {
+      if ($event.srcEvent && $event.srcEvent.type == 'touchend') {
         $timeout(function() {
           $ctrl.inputElement.focus();
           $ctrl.inputElement.select();
@@ -115,6 +115,12 @@
           $ctrl.inputContainer.classList.add('ng-hide');
           $ctrl.clickableElement.classList.remove('ng-hide');
           $ctrl.updateCalendarName();
+        }, function() {
+          $ctrl.editMode = true;
+          $timeout(function() {
+            $ctrl.inputElement.focus();
+            $ctrl.inputElement.select();
+          }, 200); // delayed focus for iOS
         })
         .finally(function() {
           $ctrl.inputElement.disabled = false;