diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2011-12-09 15:25:26 +0100 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2011-12-09 15:25:26 +0100 |
| commit | 7aa8eb3427679366905840b80a69e36344a5632d (patch) | |
| tree | 347a2100ad445620ed21b17f9faa90fe0edb3874 /files/js/files.js | |
| parent | b3661adf028570f6158dfd5092ecb1398d5be0df (diff) | |
| parent | eeaf539a4414e3081b6f6652167363a3221a1973 (diff) | |
| download | nextcloud-server-7aa8eb3427679366905840b80a69e36344a5632d.tar.gz nextcloud-server-7aa8eb3427679366905840b80a69e36344a5632d.zip | |
Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
Conflicts:
apps/contacts/ajax/deletebook.php
apps/contacts/index.php
Diffstat (limited to 'files/js/files.js')
| -rw-r--r-- | files/js/files.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/files/js/files.js b/files/js/files.js index 53437453ff9..5a528f5122c 100644 --- a/files/js/files.js +++ b/files/js/files.js @@ -70,7 +70,9 @@ $(document).ready(function() { procesSelection(); } else { var filename=$(this).parent().parent().attr('data-file'); - if(!FileList.isLoading(filename)){ + var tr=$('tr').filterAttr('data-file',filename); + var renaming=tr.data('renaming') + if(!renaming && !FileList.isLoading(filename)){ var mime=$(this).parent().parent().data('mime'); var type=$(this).parent().parent().data('type'); var action=FileActions.getDefault(mime,type); |