summaryrefslogtreecommitdiffstats
path: root/apps/files/js/files.js
diff options
context:
space:
mode:
authorJörn Friedrich Dreyer <jfd@butonic.de>2013-10-23 12:02:06 +0200
committerJörn Friedrich Dreyer <jfd@butonic.de>2013-10-23 12:02:06 +0200
commit3121dc8cb5e436af3f465dd8a5da5ddcf43377e0 (patch)
tree60f5cb38c2439403b9edb83a13ac62f781148c13 /apps/files/js/files.js
parent8ed73e5cedac5e22a8e50d1fdf04feb400b676fd (diff)
parent2d14daf36bf6c808e55895c78b42144942b73246 (diff)
downloadnextcloud-server-3121dc8cb5e436af3f465dd8a5da5ddcf43377e0.tar.gz
nextcloud-server-3121dc8cb5e436af3f465dd8a5da5ddcf43377e0.zip
Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_existing_filename
Conflicts: apps/files/js/filelist.js
Diffstat (limited to 'apps/files/js/files.js')
-rw-r--r--apps/files/js/files.js12
1 files changed, 10 insertions, 2 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 3567904f2f2..389bf1bf197 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -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;
});
});
}