aboutsummaryrefslogtreecommitdiffstats
path: root/files/js
diff options
context:
space:
mode:
authorGeorg Ehrke <dev@georgswebsite.de>2012-04-18 12:20:09 +0200
committerGeorg Ehrke <dev@georgswebsite.de>2012-04-18 12:20:09 +0200
commiteb29c577c2b2378c1983e55ddaf4955ad9ae7fe2 (patch)
tree4a53459150c6485666e350982ef3ad61ab3936c8 /files/js
parent3e0e6e35f4fa638dd42bd5adc3b26e078bf3d081 (diff)
parent57b8ff890c75169521041b4eb9cdf4582b68e551 (diff)
downloadnextcloud-server-eb29c577c2b2378c1983e55ddaf4955ad9ae7fe2.tar.gz
nextcloud-server-eb29c577c2b2378c1983e55ddaf4955ad9ae7fe2.zip
Merge branch 'master' into movable_apps
Diffstat (limited to 'files/js')
-rw-r--r--files/js/fileactions.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/files/js/fileactions.js b/files/js/fileactions.js
index 5c6dc65d49d..80e918a455c 100644
--- a/files/js/fileactions.js
+++ b/files/js/fileactions.js
@@ -53,7 +53,7 @@ FileActions={
},
display:function(parent){
FileActions.currentFile=parent;
- $('#fileList .action').remove();
+ $('#fileList span.fileactions, #fileList td.date a.action').remove();
var actions=FileActions.get(FileActions.getCurrentMimeType(),FileActions.getCurrentType());
var file=FileActions.getCurrentFile();
if($('tr').filterAttr('data-file',file).data('renaming')){
@@ -113,7 +113,7 @@ FileActions={
return false;
},
hide:function(){
- $('#fileList span.fileactions').fadeOut(200,function(){
+ $('#fileList span.fileactions, #fileList td.date a.action').fadeOut(200,function(){
$(this).remove();
});
},