diff options
Diffstat (limited to 'files')
| -rw-r--r-- | files/ajax/move.php | 2 | ||||
| -rw-r--r-- | files/js/files.js | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/files/ajax/move.php b/files/ajax/move.php index 8a56a015486..c2490ecc6b3 100644 --- a/files/ajax/move.php +++ b/files/ajax/move.php @@ -14,7 +14,7 @@ $target = $_GET["target"]; if(OC_Files::move($dir,$file,$target,$file)){ OC_JSON::success(array("data" => array( "dir" => $dir, "files" => $file ))); }else{ - OC_JSON::error(array("data" => array( "message" => "Could move $file" ))); + OC_JSON::error(array("data" => array( "message" => "Couldn't move $file" ))); } ?> diff --git a/files/js/files.js b/files/js/files.js index 5a528f5122c..88a07a0776e 100644 --- a/files/js/files.js +++ b/files/js/files.js @@ -11,8 +11,8 @@ $(document).ready(function() { $('#file_action_panel').attr('activeAction', false); //drag/drop of files - $('#fileList tr td.filename').draggable(dragOptions); - $('#fileList tr[data-type="dir"] td.filename').droppable(folderDropOptions); + $('#fileList tr[data-file!="Shared"] td.filename').draggable(dragOptions); + $('#fileList tr[data-type="dir"][data-file!="Shared"] 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); |