From c0bdad58932a29a1f21909e959416369a790fa8d Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 15 Apr 2012 16:06:16 +0200
Subject: [PATCH] dont allow draging files to the current directory
---
files/js/files.js | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/files/js/files.js b/files/js/files.js
index 1c0a40c236..2d943d85cd 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -13,9 +13,11 @@ $(document).ready(function() {
//drag/drop of files
$('#fileList tr td.filename').draggable(dragOptions);
$('#fileList tr[data-type="dir"][data-write="true"] td.filename').droppable(folderDropOptions);
- $('div.crumb').droppable(crumbDropOptions);
+ $('div.crumb:not(.last)').droppable(crumbDropOptions);
$('ul#apps>li:first-child').data('dir','');
- $('ul#apps>li:first-child').droppable(crumbDropOptions);
+ if($('div.crumb').length){
+ $('ul#apps>li:first-child').droppable(crumbDropOptions);
+ }
// Triggers invisible file input
$('.file_upload_button_wrapper').live('click', function() {
@@ -412,7 +414,7 @@ var dragOptions={
};
var folderDropOptions={
drop: function( event, ui ) {
- var file=ui.draggable.text().trim();
+ var file=ui.draggable.parent().data('file');
var target=$(this).text().trim();
var dir=$('#dir').val();
$.ajax({
@@ -438,7 +440,7 @@ var crumbDropOptions={
if(dir.substr(-1,1)!='/'){
dir=dir+'/';
}
- if(target==dir){
+ if(target==dir || target+'/'==dir){
return;
}
$.ajax({
--
GitLab