aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/js/fileactions.js
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2014-04-08 17:17:48 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2014-04-23 12:54:25 +0200
commit27c5a978f91e7aa447a2acca040fd173baba53b9 (patch)
tree462029db1f2b24055f82967f1e5cf4e5736f9d2c /apps/files/js/fileactions.js
parent83d68107253834aa5322198295c827d94e951e90 (diff)
downloadnextcloud-server-27c5a978f91e7aa447a2acca040fd173baba53b9.tar.gz
nextcloud-server-27c5a978f91e7aa447a2acca040fd173baba53b9.zip
we no longer need to handle the Shared folder different from any other folder
Diffstat (limited to 'apps/files/js/fileactions.js')
-rw-r--r--apps/files/js/fileactions.js8
1 files changed, 2 insertions, 6 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 631aebea954..ecdfa72a477 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -118,10 +118,6 @@ var FileActions = {
};
var addAction = function (name, action, displayName) {
- // NOTE: Temporary fix to prevent rename action in root of Shared directory
- if (name === 'Rename' && $('#dir').val() === '/Shared') {
- return true;
- }
if ((name === 'Download' || action !== defaultAction) && name !== 'Delete') {
@@ -160,7 +156,7 @@ var FileActions = {
addAction(name, ah, displayName);
}
});
- if(actions.Share && !($('#dir').val() === '/' && file === 'Shared')){
+ if(actions.Share){
displayName = t('files', 'Share');
addAction('Share', actions.Share, displayName);
}
@@ -223,7 +219,7 @@ $(document).ready(function () {
$('#fileList tr').each(function () {
FileActions.display($(this).children('td.filename'));
});
-
+
$('#fileList').trigger(jQuery.Event("fileActionsReady"));
});