aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorBjörn Schießle <bjoern@schiessle.org>2013-02-09 03:14:25 -0800
committerBjörn Schießle <bjoern@schiessle.org>2013-02-09 03:14:25 -0800
commitca243f3fac92e2fdb3f38660779a024ef4ce2763 (patch)
tree90c8bd39ce9e0bcf647c73f6e5b8f3a65370dec7 /apps/files
parent5a15221910aa8307d58ae89fc8cb3555663b36d8 (diff)
parentc72537cd852583b64914e1e8da55d8520e64d554 (diff)
downloadnextcloud-server-ca243f3fac92e2fdb3f38660779a024ef4ce2763.tar.gz
nextcloud-server-ca243f3fac92e2fdb3f38660779a024ef4ce2763.zip
Merge pull request #1521 from schiesbn/label_fixed
don't call the delete button unshare, unshare operation no longer available
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/js/fileactions.js5
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" />';