merge master into filesystem

2 files changed, 11 insertions, 7 deletions

diff --git a/files/js/fileactions.js b/files/js/fileactions.js
index 6f0729e43b6..b5dd3982803 100644
--- a/files/js/fileactions.js
+++ b/files/js/fileactions.js
@@ -66,7 +66,7 @@ FileActions={
 				if(img.call){
 					img=img(file);
 				}
-				var html='<a href="#" title="'+name+'" class="action" />';
+				var html='<a href="#" title="'+name+'" class="action" style="display:none" />';
 				var element=$(html);
 				if(img){
 					element.append($('<img src="'+img+'"/>'));
@@ -80,6 +80,7 @@ FileActions={
 					FileActions.hide();
 					action(currentFile);
 				});
+				element.hide();
 				parent.children('a.name').append(element);
 			}
 		}
@@ -88,7 +89,7 @@ FileActions={
 			if(img.call){
 				img=img(file);
 			}
-			var html='<a href="#" title="Delete" class="action" />';
+			var html='<a href="#" title="Delete" class="action" style="display:none" />';
 			var element=$(html);
 			if(img){
 				element.append($('<img src="'+img+'"/>'));
@@ -102,10 +103,13 @@ FileActions={
 				FileActions.hide();
 				action(currentFile);
 			});
+			element.hide();
 			parent.parent().children().last().append(element);
 		}
-		$('#fileList .action').hide();
-		$('#fileList .action').fadeIn(200);
+		$('#fileList .action').css('-o-transition-property','none');//temporarly disable 
+		$('#fileList .action').fadeIn(200,function(){
+			$('#fileList .action').css('-o-transition-property','opacity');
+		});
 		return false;
 	},
 	hide:function(){
diff --git a/files/js/files.js b/files/js/files.js
index b500ecfed70..649f193aa2d 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -12,7 +12,7 @@ $(document).ready(function() {
 
 	//drag/drop of files
 	$('#fileList tr td.filename').draggable(dragOptions);
-	$('#fileList tr[data-type="dir"] td.filename').droppable(folderDropOptions);
+	$('#fileList tr[data-type="dir"][data-write="true"] td.filename').droppable(folderDropOptions);
 	$('div.crumb').droppable(crumbDropOptions);
 	$('ul#apps>li:first-child').data('dir','');
 	$('ul#apps>li:first-child').droppable(crumbDropOptions);
@@ -71,8 +71,8 @@ $(document).ready(function() {
 		} else {
 			var filename=$(this).parent().parent().attr('data-file');
 			var tr=$('tr').filterAttr('data-file',filename);
-			var renaming=tr.data('renaming')
-				if(!renaming && !FileList.isLoading(filename)){
+			var renaming=tr.data('renaming');
+			if(!renaming && !FileList.isLoading(filename)){
 				var mime=$(this).parent().parent().data('mime');
 				var type=$(this).parent().parent().data('type');
 				var action=FileActions.getDefault(mime,type);