diff options
| author | Robin Appelman <icewind@owncloud.com> | 2013-02-08 00:11:54 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2013-02-08 00:11:54 +0100 |
| commit | f93f9dd50cce6b6e2ed4eeca2d34b2bac82e0350 (patch) | |
| tree | c76b2eabb63ed308eb882468cb2a74042e6f9d53 /apps/files/js/fileactions.js | |
| parent | 697536cf6ad1c9a862c32605b807172dfa680d22 (diff) | |
| parent | 3bd33b69a1c37cee5c3d180ec8952a611aabb4d1 (diff) | |
| download | nextcloud-server-f93f9dd50cce6b6e2ed4eeca2d34b2bac82e0350.tar.gz nextcloud-server-f93f9dd50cce6b6e2ed4eeca2d34b2bac82e0350.zip | |
merge master into trash_fileactions
Diffstat (limited to 'apps/files/js/fileactions.js')
| -rw-r--r-- | apps/files/js/fileactions.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index c30f1bcddd8..af3fc483910 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -115,6 +115,8 @@ var FileActions = { // NOTE: Temporary fix to allow unsharing of files in root of Shared folder if ($('#dir').val() == '/Shared') { var html = '<a href="#" original-title="' + t('files', 'Unshare') + '" class="action delete" />'; + } else if (typeof trashBinApp !== 'undefined' && trashBinApp) { + var html = '<a href="#" original-title="' + t('files', 'Delete permanently') + '" class="action delete" />'; } else { var html = '<a href="#" original-title="' + t('files', 'Delete') + '" class="action delete" />'; } |