diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-21 23:21:50 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-21 23:21:50 +0200 |
| commit | 0918fc7d9156f3846a19b673db5b01422a59c506 (patch) | |
| tree | 131188252fd42c4f3c9673975adafa24783c632f /files/js/fileactions.js | |
| parent | 77cefdedb86de65e69f470c8b6a1b03bb001966e (diff) | |
| parent | 74e540271122222f650bbbfaeaac310b0e592674 (diff) | |
| download | nextcloud-server-0918fc7d9156f3846a19b673db5b01422a59c506.tar.gz nextcloud-server-0918fc7d9156f3846a19b673db5b01422a59c506.zip | |
fix merge conflicts
Diffstat (limited to 'files/js/fileactions.js')
| -rw-r--r-- | files/js/fileactions.js | 4 |
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(); }); }, |