wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix race condition in lazy preview loading

Browse source
This commit is contained in:
Jörn Friedrich Dreyer 2013-09-19 14:46:33 +02:00
parent 078bf0df25
commit 98ff847830
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
apps/files/js/files.js
View file

@ -628,18 +628,24 @@ function getPathForPreview(name) {
}
function lazyLoadPreview(path, mime, ready, width, height) {
getMimeIcon(mime,ready);
if (!width) {
width = $('#filestable').data('preview-x');
}
if (!height) {
height = $('#filestable').data('preview-y');
}
var previewURL = OC.Router.generate('core_ajax_preview', {file: encodeURIComponent(path), x:width, y:height});
$.get(previewURL, function() {
previewURL = previewURL.replace('(','%28');
previewURL = previewURL.replace(')','%29');
ready(previewURL + '&reload=true');
// get mime icon url
getMimeIcon(mime, function(iconURL) {
ready(iconURL); // set mimeicon URL
// now try getting a preview thumbnail URL
if ( ! width ) {
width = $('#filestable').data('preview-x');
}
if ( ! height ) {
height = $('#filestable').data('preview-y');
}
var previewURL = OC.Router.generate('core_ajax_preview', {file: encodeURIComponent(path), x:width, y:height});
$.get(previewURL, function() {
previewURL = previewURL.replace('(', '%28');
previewURL = previewURL.replace(')', '%29');
//set preview thumbnail URL
ready(previewURL + '&reload=true');
});
});
}