diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-01-16 03:06:11 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-01-16 03:06:11 +0100 |
| commit | 96e2f15d8a6eee83e30bdf77ef3582f0c26b52e0 (patch) | |
| tree | 9df43704cb7e580d328d6780561a0ec146003e7b /files/js/files.js | |
| parent | ccc43f0ea02a048583fff715f00cda0280124586 (diff) | |
| parent | b0dbca0cc7f2d07dbf01c54861b932d8dc9fe2df (diff) | |
| download | nextcloud-server-96e2f15d8a6eee83e30bdf77ef3582f0c26b52e0.tar.gz nextcloud-server-96e2f15d8a6eee83e30bdf77ef3582f0c26b52e0.zip | |
merge master into filesystem
Diffstat (limited to 'files/js/files.js')
| -rw-r--r-- | files/js/files.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/files/js/files.js b/files/js/files.js index b500ecfed70..649f193aa2d 100644 --- a/files/js/files.js +++ b/files/js/files.js @@ -12,7 +12,7 @@ $(document).ready(function() { //drag/drop of files $('#fileList tr td.filename').draggable(dragOptions); - $('#fileList tr[data-type="dir"] td.filename').droppable(folderDropOptions); + $('#fileList tr[data-type="dir"][data-write="true"] td.filename').droppable(folderDropOptions); $('div.crumb').droppable(crumbDropOptions); $('ul#apps>li:first-child').data('dir',''); $('ul#apps>li:first-child').droppable(crumbDropOptions); @@ -71,8 +71,8 @@ $(document).ready(function() { } else { var filename=$(this).parent().parent().attr('data-file'); var tr=$('tr').filterAttr('data-file',filename); - var renaming=tr.data('renaming') - if(!renaming && !FileList.isLoading(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); |