Merge branch 'master' of github.com:owncloud/core into issue_1776

Conflicts:
	core/templates/layout.user.php

2 files changed, 7 insertions, 3 deletions

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index ea721059c3f..f5f3f3ba0c6 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -334,7 +334,7 @@ var FileList={
 					if (result.status == 'success') {
 						$.each(files,function(index,file){
 							var files = $('tr').filterAttr('data-file',file);
-							files.hide();
+							files.remove();
 							files.find('input[type="checkbox"]').removeAttr('checked');
 							files.removeClass('selected');
 						});
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 6801fb59910..464f7703685 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -524,7 +524,7 @@ $(document).ready(function() {
 		crumb.text(text);
 	}
 
-	$(window).click(function(){
+	$(document).click(function(){
 		$('#new>ul').hide();
 		$('#new').removeClass('active');
 		$('#new li').each(function(i,element){
@@ -595,7 +595,7 @@ $(document).ready(function() {
 								var date=new Date();
 								FileList.addFile(name,0,date,false,hidden);
 								var tr=$('tr').filterAttr('data-file',name);
-								tr.data('mime','text/plain').data('id',result.data.id);
+								tr.attr('data-mime','text/plain');
 								tr.attr('data-id', result.data.id);
 								getMimeIcon('text/plain',function(path){
 									tr.find('td.filename').attr('style','background-image:url('+path+')');
@@ -863,6 +863,10 @@ var dragOptions={
 		$('#fileList tr td.filename').addClass('ui-draggable');
 	}
 }
+// sane browsers support using the distance option
+if ( ! $.browser.msie) {
+	dragOptions['distance'] = 20;
+} 
 
 var folderDropOptions={
 	drop: function( event, ui ) {