Improve folders rename

pull/105/head
Francis Lachapelle 2015-09-16 16:15:04 -04:00
parent 7b580f8af6
commit 70bb512bb8
6 changed files with 23 additions and 18 deletions

View File

@ -47,7 +47,7 @@
ng-show="app.editMode!=folder.id">{{folder.name}}</p>
<md-input-container class="md-flex md-tile-content"
ng-show="app.editMode == folder.id">
<input class="folder-name" type="text"
<input class="sg-item-name" type="text"
label:aria-label="Name of the Address Book"
ng-model="folder.name"
ng-cloak="ng-cloak"
@ -123,7 +123,7 @@
ng-show="editMode!=folder.id">{{folder.name}}</p>
<md-input-container class="md-flex md-tile-content"
ng-show="app.editMode==folder.id">
<input class="folder-name" type="text"
<input class="sg-item-name" type="text"
label:aria-label="Name of the Address Book"
ng-model="folder.name"
ng-cloak="ng-cloak"

View File

@ -260,9 +260,9 @@
{{app.metadataForFolder(folder).name}}
<span ng-show="folder.unseenCount"> ({{folder.unseenCount}})</span>
</p>
<md-input-container class="md-flex md-tile-content"
<md-input-container class="md-flex"
ng-show="app.editMode == folder.path">
<input class="folder-name" type="text"
<input class="sg-item-name" type="text"
label:aria-label="Enter the new name of your folder"
ng-model="folder.name"
ng-blur="app.saveFolder(folder)"

View File

@ -17,9 +17,7 @@
return function(scope, element, attrs) {
element.bind("keydown keypress", function(event) {
if (event.which === ENTER_KEY) {
scope.$apply(function() {
scope.$eval(attrs.sgEnter);
});
scope.$apply(attrs.sgEnter);
event.preventDefault();
}
});

View File

@ -351,15 +351,13 @@
Mailbox.prototype.$rename = function() {
var _this = this,
findParent,
deferred = Mailbox.$q.defer(),
parent,
children,
i;
if (this.name == this.$shadowData.name) {
// Name hasn't changed
deferred.resolve();
return deferred.promise;
return Mailbox.$q.when();
}
// Local recursive function
@ -391,7 +389,7 @@
// Find index of mailbox among siblings
i = _.indexOf(_.pluck(children, 'id'), this.id);
this.$save().then(function(data) {
return this.$save().then(function(data) {
var sibling;
angular.extend(_this, data); // update the path attribute
_this.id = _this.$id();
@ -409,13 +407,7 @@
i = children.length;
}
children.splice(i, 0, _this);
deferred.resolve();
}, function(data) {
deferred.reject(data);
});
return deferred.promise;
};
/**

View File

@ -222,7 +222,12 @@
}
function saveFolder(folder) {
folder.$rename();
folder.$rename()
.then(function(data) {
vm.editMode = false;
}, function(data, status) {
Dialog.alert(l('Warning'), data);
});
}
function compactFolder(folder) {

View File

@ -25,6 +25,16 @@ md-list-item {
}
}
// Remove padding of input fields in the sidenav for better transitions between read and edit mode of a folder
md-sidenav {
md-input-container {
padding: 0;
.md-input {
padding-left: 0;
}
}
}
// Add some padding to the first icon in a list item
//.md-list-item-inner {
// > i:first-child {