show fileactions inline on hover

2 files changed, 22 insertions, 14 deletions

diff --git a/files/js/fileactions.js b/files/js/fileactions.js
index b683dc0cd3a..3ad417c91c4 100644
--- a/files/js/fileactions.js
+++ b/files/js/fileactions.js
@@ -49,33 +49,39 @@ FileActions={
 		return actions[name];
 	},
 	display:function(parent){
-		$('#file_menu ul').empty();
+		$('#file_menu').empty();
 		parent.append($('#file_menu'));
 		var actions=FileActions.get(FileActions.getCurrentMimeType(),FileActions.getCurrentType());
 		for(name in actions){
-			var html='<li><a href="" alt="'+name+'">'+name+'</a></li>';
+			var html='<a href="#" alt="'+name+'">'+name+'</a>';
 			var element=$(html);
 			element.data('action',name);
 			element.click(function(event){
+				event.stopPropagation();
 				event.preventDefault();
-				$('#file_menu').slideToggle(250);
 				var action=actions[$(this).data('action')];
-				$('#file_menu ul').empty();
-				action(FileActions.getCurrentFile());
+				var currentFile=FileActions.getCurrentFile();
+				FileActions.hide();
+				action(currentFile);
 			});
-			$('#file_menu>ul').append(element);
+			$('#file_menu').append(element);
 		}
-		$('#file_menu').slideToggle(250);
+		$('#file_menu').show();
 		return false;
 	},
+	hide:function(){
+		$('#file_menu').hide();
+		$('#file_menu').empty();
+		$('body').append($('#file_menu'));
+	},
 	getCurrentFile:function(){
-		return $('#file_menu').parents('tr:first').attr('data-file');
+		return $('#file_menu').parent().parent().attr('data-file');
 	},
 	getCurrentMimeType:function(){
-		return $('#file_menu').parents('tr:first').attr('data-mime');
+		return $('#file_menu').parent().parent().attr('data-mime');
 	},
 	getCurrentType:function(){
-		return $('#file_menu').parents('tr:first').attr('data-type');
+		return $('#file_menu').parent().parent().attr('data-type');
 	}
 }
 
diff --git a/files/js/files.js b/files/js/files.js
index b0970233739..f1c00650d0a 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -31,11 +31,13 @@ $(document).ready(function() {
 	});
 	
 	// Sets the file-action buttons behaviour :
-	$('td.fileaction a').live('click',function(event) {
-		event.preventDefault();
-		FileActions.display($(this).parent());
+	$('tr').live('mouseenter',function(event) {
+		FileActions.display($(this).children('td.filename'));
 	});
-	
+	$('tr').live('mouseleave',function(event) {
+		FileActions.hide();
+	});
+
 	// Sets the file link behaviour :
 	$('td.filename a').live('click',function(event) {
 		event.preventDefault();