diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-11-30 00:18:42 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-11-30 00:18:42 +0100 |
| commit | d33f697a5f3438f286ba3abe63255b6797a6fc03 (patch) | |
| tree | 3bde00fb82540d9a44d0cfe97b41a7c6ecc668d3 /apps/files/js/files.js | |
| parent | a609992a75d1dad15398f55e22ad2244c78650dc (diff) | |
| parent | 9b709fa95df5b93b9fb05e33158122003891c154 (diff) | |
| download | nextcloud-server-d33f697a5f3438f286ba3abe63255b6797a6fc03.tar.gz nextcloud-server-d33f697a5f3438f286ba3abe63255b6797a6fc03.zip | |
merge master into filesystem
Diffstat (limited to 'apps/files/js/files.js')
| -rw-r--r-- | apps/files/js/files.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 3b33fc19780..7c6d4fd3ee5 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -722,7 +722,7 @@ function updateBreadcrumb(breadcrumbHtml) { //options for file drag/dropp var dragOptions={ - distance: 20, revert: 'invalid', opacity: 0.7, + distance: 20, revert: 'invalid', opacity: 0.7, helper: 'clone', stop: function(event, ui) { $('#fileList tr td.filename').addClass('ui-draggable'); } @@ -856,7 +856,7 @@ function getMimeIcon(mime, ready){ if(getMimeIcon.cache[mime]){ ready(getMimeIcon.cache[mime]); }else{ - $.get( OC.filePath('files','ajax','mimeicon.php')+'?mime='+mime, function(path){ + $.get( OC.filePath('files','ajax','mimeicon.php')+'&mime='+mime, function(path){ getMimeIcon.cache[mime]=path; ready(getMimeIcon.cache[mime]); }); |