upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

Fix preview of old file on public upload conflicts

Browse source
This commit is contained in:
Olivier Paroz 2015-07-20 16:51:28 +02:00 committed by Georg Ehrke
parent bbd1e99605
commit 04b14df35c
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
apps/files_sharing/js/public.js
View file

@ -159,9 +159,18 @@ OCA.Sharing.PublicApp = {
};
this.fileList.generatePreviewUrl = function (urlSpec) {
urlSpec = urlSpec || {};
if (!urlSpec.x) {
urlSpec.x = 36;
}
if (!urlSpec.y) {
urlSpec.y = 36;
}
urlSpec.x *= window.devicePixelRatio;
urlSpec.y *= window.devicePixelRatio;
urlSpec.x = Math.floor(urlSpec.x);
urlSpec.y = Math.floor(urlSpec.y);
urlSpec.t = $('#dirToken').val();
urlSpec.y = Math.floor(36 * window.devicePixelRatio);
urlSpec.x = Math.floor(36 * window.devicePixelRatio);
return OC.generateUrl('/apps/files_sharing/ajax/publicpreview.php?') + $.param(urlSpec);
};
@ -293,15 +302,8 @@ $(document).ready(function () {
if (window.Files) {
// HACK: for oc-dialogs previews that depends on Files:
Files.lazyLoadPreview = function (path, mime, ready, width, height, etag) {
return App.fileList.lazyLoadPreview({
path: path,
mime: mime,
callback: ready,
width: width,
height: height,
etag: etag
});
Files.generatePreviewUrl = function (urlSpec) {
return App.fileList.generatePreviewUrl(urlSpec);
};
}
});

4
core/js/oc-dialogs.js
View file

@ -388,9 +388,9 @@ var OCdialogs = {
c: original.etag,
forceIcon: 0
};
var previewpath = OC.generateUrl('/core/preview.png?') + $.param(urlSpec);
var previewpath = Files.generatePreviewUrl(urlSpec);
// Escaping single quotes
previewpath = previewpath.replace(/'/g, "%27")
previewpath = previewpath.replace(/'/g, "%27");
$originalDiv.find('.icon').css({"background-image": "url('" + previewpath + "')"});
getCroppedPreview(replacement).then(
function(path){