summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Appelman <icewind1991@gmail.com>2011-06-04 22:35:50 +0200
committerRobin Appelman <icewind1991@gmail.com>2011-06-04 22:35:50 +0200
commit40a96aab28a67c3ab580be4d0228e78a68409123 (patch)
treefb1e27f82ea254925b0e116eacdfbfad09b69732
parentdab656007d4ecc75546d5d7a3b0743b896dd6666 (diff)
downloadnextcloud-server-40a96aab28a67c3ab580be4d0228e78a68409123.tar.gz
nextcloud-server-40a96aab28a67c3ab580be4d0228e78a68409123.zip
fix file action dialog not reappearing after being used
-rw-r--r--files/js/fileactions.js9
1 files changed, 5 insertions, 4 deletions
diff --git a/files/js/fileactions.js b/files/js/fileactions.js
index 0722708e683..dec1d1cfb04 100644
--- a/files/js/fileactions.js
+++ b/files/js/fileactions.js
@@ -46,7 +46,7 @@ FileActions={
}
},
display:function(parent){
- $('#file_menu>ul').empty();
+ $('#file_menu ul').empty();
parent.append($('#file_menu'));
var actions=FileActions.get(FileActions.getCurrentMimeType(),FileActions.getCurrentType());
for(name in actions){
@@ -55,7 +55,10 @@ FileActions={
element.data('action',name);
element.click(function(event){
event.preventDefault();
- actions[$(this).data('action')](FileActions.getCurrentFile());
+ $('#file_menu').slideToggle(250);
+ var action=actions[$(this).data('action')];
+ $('#file_menu ul').empty();
+ action(FileActions.getCurrentFile());
});
$('#file_menu>ul').append(element);
}
@@ -75,7 +78,6 @@ FileActions={
FileActions.register('all','Download',function(filename){
window.location='ajax/download.php?files='+filename+'&dir='+$('#dir').val();
- $('#file_menu').slideToggle(250);
});
FileActions.register('all','Delete',function(filename){
@@ -94,7 +96,6 @@ FileActions.setDefault('all','Download');
FileActions.register('dir','Open',function(filename){
window.location='index.php?dir='+$('#dir').val()+'/'+filename;
- $('#file_menu').slideToggle(250);
});
FileActions.setDefault('dir','Open'); \ No newline at end of file