summaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2013-02-06 11:27:32 -0800
committerLukas Reschke <lukas@statuscode.ch>2013-02-06 11:27:32 -0800
commite522872408e4fab2277d6deee475d0241ad6a825 (patch)
tree697feaa2795eeef06ead5524ac6bf6352d2e2333 /apps/files
parentad644b4e08ddee30dddbe9a2311f0de3d3c5fae4 (diff)
parentfd171a4f3407a4c4c01b7eac256e2b1a9f920f25 (diff)
downloadnextcloud-server-e522872408e4fab2277d6deee475d0241ad6a825.tar.gz
nextcloud-server-e522872408e4fab2277d6deee475d0241ad6a825.zip
Merge pull request #1498 from schiesbn/delete_trash
delete files from trash bin permanently
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/js/fileactions.js2
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" />';
}