summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Schießle <schiessle@owncloud.com>2012-10-02 18:38:17 +0200
committerBjörn Schießle <schiessle@owncloud.com>2012-10-02 18:38:17 +0200
commit92b37119e36a6c7d418e56d7c6d73fd4625210b7 (patch)
tree4e8e0eb07eda0f78ea80356567b6c94d40dc3d96
parent39735721ec880e6fbf29c9773f0003c5aaa37454 (diff)
downloadnextcloud-server-92b37119e36a6c7d418e56d7c6d73fd4625210b7.tar.gz
nextcloud-server-92b37119e36a6c7d418e56d7c6d73fd4625210b7.zip
remove textbox after pressing "enter" even if the name is the same
-rw-r--r--apps/files/js/filelist.js31
1 files changed, 15 insertions, 16 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 683f7db8678..4bce4a624ef 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -157,22 +157,21 @@ var FileList={
});
}
-
- tr.attr('data-file', newname);
- var path = td.children('a.name').attr('href');
- td.children('a.name').attr('href', path.replace(encodeURIComponent(name), encodeURIComponent(newname)));
- if (newname.indexOf('.') > 0 && tr.data('type') != 'dir') {
- var basename=newname.substr(0,newname.lastIndexOf('.'));
- } else {
- var basename=newname;
- }
- td.children('a.name').empty();
- var span=$('<span class="nametext"></span>');
- span.text(basename);
- td.children('a.name').append(span);
- if (newname.indexOf('.') > 0 && tr.data('type') != 'dir') {
- span.append($('<span class="extension">'+newname.substr(newname.lastIndexOf('.'))+'</span>'));
- }
+ }
+ tr.attr('data-file', newname);
+ var path = td.children('a.name').attr('href');
+ td.children('a.name').attr('href', path.replace(encodeURIComponent(name), encodeURIComponent(newname)));
+ if (newname.indexOf('.') > 0 && tr.data('type') != 'dir') {
+ var basename=newname.substr(0,newname.lastIndexOf('.'));
+ } else {
+ var basename=newname;
+ }
+ td.children('a.name').empty();
+ var span=$('<span class="nametext"></span>');
+ span.text(basename);
+ td.children('a.name').append(span);
+ if (newname.indexOf('.') > 0 && tr.data('type') != 'dir') {
+ span.append($('<span class="extension">'+newname.substr(newname.lastIndexOf('.'))+'</span>'));
}
return false;
});