Merge branch 'master' into fix-sharing-code

1 files changed, 15 insertions, 7 deletions

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index a35ed4add8c..ec2dc7c62ea 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -301,7 +301,7 @@ $(document).ready(function() {
 	});
 
 	$('.download').click('click',function(event) {
-		var files=getSelectedFiles('name');
+		var files=getSelectedFilesTrash('name');
 		var fileslist = JSON.stringify(files);
 		var dir=$('#dir').val()||'/';
 		OC.Notification.show(t('files','Your download is being prepared. This might take some time if the files are big.'));
@@ -315,7 +315,7 @@ $(document).ready(function() {
 	});
 
 	$('.delete-selected').click(function(event) {
-		var files=getSelectedFiles('name');
+		var files=getSelectedFilesTrash('name');
 		event.preventDefault();
 		FileList.do_delete(files);
 		return false;
@@ -433,7 +433,7 @@ var createDragShadow = function(event){
 		$(event.target).parents('tr').find('td input:first').prop('checked',true);
 	}
 
-	var selectedFiles = getSelectedFiles();
+	var selectedFiles = getSelectedFilesTrash();
 
 	if (!isDragSelected && selectedFiles.length == 1) {
 		//revert the selection
@@ -562,7 +562,7 @@ var crumbDropOptions={
 }
 
 function procesSelection(){
-	var selected=getSelectedFiles();
+	var selected=getSelectedFilesTrash();
 	var selectedFiles=selected.filter(function(el){return el.type=='file'});
 	var selectedFolders=selected.filter(function(el){return el.type=='dir'});
 	if(selectedFiles.length==0 && selectedFolders.length==0) {
@@ -607,7 +607,7 @@ function procesSelection(){
  * if property is set, an array with that property for each file is returnd
  * if it's ommited an array of objects with all properties is returned
  */
-function getSelectedFiles(property){
+function getSelectedFilesTrash(property){
 	var elements=$('td.filename input:checkbox:checked').parent().parent();
 	var files=[];
 	elements.each(function(i,element){
@@ -663,8 +663,16 @@ function lazyLoadPreview(path, mime, ready, width, height) {
 		$.get(previewURL, function() {
 			previewURL = previewURL.replace('(', '%28');
 			previewURL = previewURL.replace(')', '%29');
-			//set preview thumbnail URL
-			ready(previewURL + '&reload=true');
+			previewURL += '&reload=true';
+
+			// preload image to prevent delay
+			// this will make the browser cache the image
+			var img = new Image();
+			img.onload = function(){
+				//set preview thumbnail URL
+				ready(previewURL);
+			}
+			img.src = previewURL;
 		});
 	});
 }