diff options
| author | Olivier Paroz <oparoz@users.noreply.github.com> | 2015-05-29 13:49:51 +0200 |
|---|---|---|
| committer | Olivier Paroz <oparoz@users.noreply.github.com> | 2015-05-29 13:49:51 +0200 |
| commit | 4e364311f1a07e2359eff2a4412ac90140059076 (patch) | |
| tree | 8627bc4ea312590fdd317b79a40754b52c13f5ec /core/js/oc-dialogs.js | |
| parent | c700f42b68f430e9c89ce97b92ea91323c9f6ed5 (diff) | |
| download | nextcloud-server-4e364311f1a07e2359eff2a4412ac90140059076.tar.gz nextcloud-server-4e364311f1a07e2359eff2a4412ac90140059076.zip | |
Get a 96x96 preview for file conflict resolution
Diffstat (limited to 'core/js/oc-dialogs.js')
| -rw-r--r-- | core/js/oc-dialogs.js | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 0692a9df5ca..b1ad72d9206 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -381,9 +381,15 @@ var OCdialogs = { $replacementDiv.find('.mtime').text(formatDate(replacement.lastModifiedDate)); } var path = original.directory + '/' +original.name; - Files.lazyLoadPreview(path, original.mimetype, function(previewpath){ - $originalDiv.find('.icon').css('background-image','url('+previewpath+')'); - }, 96, 96, original.etag); + var urlSpec = { + file: path, + x: 96, + y: 96, + c: original.etag, + forceIcon: 0 + }; + var previewpath = OC.generateUrl('/core/preview.png?') + $.param(urlSpec); + $originalDiv.find('.icon').css('background-image','url('+previewpath+')'); getCroppedPreview(replacement).then( function(path){ $replacementDiv.find('.icon').css('background-image','url(' + path + ')'); |