diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2013-01-15 20:40:38 +0700 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2013-01-15 20:40:38 +0700 |
| commit | 6182b1353bd53bb6bdc5b06248d9742e97d2e249 (patch) | |
| tree | b154b88d910c57d17b07ce482cbeb98cb791a106 /apps/files/js/filelist.js | |
| parent | 74b4fefda87feeaf51633ea7794ac498f7dce892 (diff) | |
| parent | bb9cc227c2583adc6b51a1f6d75a9fc8333836b9 (diff) | |
| download | nextcloud-server-6182b1353bd53bb6bdc5b06248d9742e97d2e249.tar.gz nextcloud-server-6182b1353bd53bb6bdc5b06248d9742e97d2e249.zip | |
merge master into navigation
Diffstat (limited to 'apps/files/js/filelist.js')
| -rw-r--r-- | apps/files/js/filelist.js | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 96dd0323d29..66697bbbf56 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -149,10 +149,9 @@ var FileList={ event.stopPropagation(); event.preventDefault(); var newname=input.val(); - if (Files.containsInvalidCharacters(newname)) { + if (!Files.isFileNameValid(newname)) { return false; - } - if (newname != name) { + } else if (newname != name) { if (FileList.checkName(name, newname, false)) { newname = name; } else { @@ -185,6 +184,13 @@ var FileList={ td.children('a.name').show(); return false; }); + input.keyup(function(event){ + if (event.keyCode == 27) { + tr.data('renaming',false); + form.remove(); + td.children('a.name').show(); + } + }); input.click(function(event){ event.stopPropagation(); event.preventDefault(); |