summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <morris.jobke@gmail.com>2014-01-16 05:52:43 -0800
committerMorris Jobke <morris.jobke@gmail.com>2014-01-16 05:52:43 -0800
commit16033c81235e76af2900fdc8fd9340546301d45c (patch)
treea2c0e2ed4a5b90b7661d60d426fde1056a363bd7
parent45709937af2c4904c581ca83041f1c977d93950e (diff)
parent8135828b2ed411c06bcde3a2c3c738ecfa821714 (diff)
downloadnextcloud-server-16033c81235e76af2900fdc8fd9340546301d45c.tar.gz
nextcloud-server-16033c81235e76af2900fdc8fd9340546301d45c.zip
Merge pull request #6264 from owncloud/files-draggabledestroy
Fix to not destroy draggable when no draggable was set
-rw-r--r--apps/files/js/filelist.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index c02ab70ce8d..30aea9c8c8d 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -300,7 +300,10 @@ var FileList={
},
remove:function(name){
var fileEl = FileList.findFileEl(name);
- fileEl.find('td.filename').draggable('destroy');
+ if (fileEl.data('permissions') & OC.PERMISSION_DELETE) {
+ // file is only draggable when delete permissions are set
+ fileEl.find('td.filename').draggable('destroy');
+ }
fileEl.remove();
FileList.updateFileSummary();
if ( ! $('tr[data-file]').exists() ) {