diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-02-21 00:05:30 +0100 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-02-21 00:05:30 +0100 |
| commit | 6aed7abfbe4a58cec822bdd16d8c71d4bac14c28 (patch) | |
| tree | 9dd60cd8ac13d2e5a0bd147a8c79a4a49d6416bf /apps/files/js/files.js | |
| parent | fc1fba23040908fe5629f89b66a280aea5578520 (diff) | |
| parent | eb3769e6d6e1b26d2c20c7b26c6a334a5d761f08 (diff) | |
| download | nextcloud-server-6aed7abfbe4a58cec822bdd16d8c71d4bac14c28.tar.gz nextcloud-server-6aed7abfbe4a58cec822bdd16d8c71d4bac14c28.zip | |
Merge branch 'master' into trashbin_encryption
Diffstat (limited to 'apps/files/js/files.js')
| -rw-r--r-- | apps/files/js/files.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 918182162d4..8327460cca6 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -162,9 +162,10 @@ $(document).ready(function() { var tr=$('tr').filterAttr('data-file',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 permissions = $(this).parent().parent().data('permissions'); + FileActions.currentFile = $(this).parent(); + var mime=FileActions.getCurrentMimeType(); + var type=FileActions.getCurrentType(); + var permissions = FileActions.getCurrentPermissions(); var action=FileActions.getDefault(mime,type, permissions); if(action){ event.preventDefault(); |