diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-02-09 19:15:23 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-02-09 19:15:23 +0100 |
| commit | b9089fe8d966b48e4c8dc3f06fd365fc506a0199 (patch) | |
| tree | 36d04441896a142a69bba884ec6c8d9ba00d10b5 /apps/files/js/fileactions.js | |
| parent | 05b46f78281e5df49a5c6a0513a37eaf03c3c29d (diff) | |
| parent | 0222c589ac7c006c09dca6cea09cae9a1006a0b4 (diff) | |
| download | nextcloud-server-b9089fe8d966b48e4c8dc3f06fd365fc506a0199.tar.gz nextcloud-server-b9089fe8d966b48e4c8dc3f06fd365fc506a0199.zip | |
Merge branch 'master' into fixing-1424-master
Diffstat (limited to 'apps/files/js/fileactions.js')
| -rw-r--r-- | apps/files/js/fileactions.js | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index af3fc483910..e1d8b60d315 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -112,10 +112,7 @@ var FileActions = { if (img.call) { img = img(file); } - // 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) { + 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" />'; |