summaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin/js
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2013-02-28 13:32:08 +0100
committerRobin Appelman <icewind@owncloud.com>2013-02-28 13:32:08 +0100
commit12fd47af395d5d5fdbcc1da7f8df4feccbea9fd9 (patch)
tree10e461054bba0fa298faba984f949de449119b93 /apps/files_trashbin/js
parent923c51773ac6e010b5b2fdf57dca3d5c9f3ede0b (diff)
downloadnextcloud-server-12fd47af395d5d5fdbcc1da7f8df4feccbea9fd9.tar.gz
nextcloud-server-12fd47af395d5d5fdbcc1da7f8df4feccbea9fd9.zip
Trash: fix opening folders
Diffstat (limited to 'apps/files_trashbin/js')
-rw-r--r--apps/files_trashbin/js/trash.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index bd29ad30d79..39e76e10c9c 100644
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -142,12 +142,14 @@ $(document).ready(function() {
});
$('#fileList').on('click', 'td.filename a', function(event) {
- event.preventDefault();
+ var mime = $(this).parent().parent().data('mime');
+ if (mime !== 'httpd/unix-directory') {
+ event.preventDefault();
+ }
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 mime = $(this).parent().parent().data('mime');
if(mime.substr(0, 5) === 'text/'){ //no texteditor for now
return;
}