diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-01-24 12:25:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-24 12:25:55 +0100 |
| commit | 5520ba3d15b088e9151ffef89f7cd389c470563b (patch) | |
| tree | 3b7f3cb02f2f2c328dda61fa19f8982b6a03c00e /apps | |
| parent | 25c62be9d730edd1ee5f032aeddabac497ca2b74 (diff) | |
| parent | cda811b6b49d2925fa044b5c391cea27a9da8724 (diff) | |
| download | nextcloud-server-5520ba3d15b088e9151ffef89f7cd389c470563b.tar.gz nextcloud-server-5520ba3d15b088e9151ffef89f7cd389c470563b.zip | |
Merge pull request #7902 from nextcloud/fix_7700
Add fileid preview endpoint
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/js/filelist.js | 13 | ||||
| -rw-r--r-- | apps/files/js/sidebarpreviewmanager.js | 1 |
2 files changed, 13 insertions, 1 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index e50b402dea8..b46db792678 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -1511,6 +1511,7 @@ // the typeof check ensures that the default value of animate is true if (typeof(options.animate) === 'undefined' || !!options.animate) { this.lazyLoadPreview({ + fileId: fileData.id, path: path + '/' + fileData.name, mime: mime, etag: fileData.etag, @@ -1856,7 +1857,15 @@ urlSpec.x = Math.ceil(urlSpec.x); urlSpec.y = Math.ceil(urlSpec.y); urlSpec.forceIcon = 0; - return OC.generateUrl('/core/preview.png?') + $.param(urlSpec); + + if (typeof urlSpec.fileId !== 'undefined') { + delete urlSpec.file; + return OC.generateUrl('/core/preview?') + $.param(urlSpec); + } else { + delete urlSpec.fileId; + return OC.generateUrl('/core/preview.png?') + $.param(urlSpec); + } + }, /** @@ -1869,6 +1878,7 @@ */ lazyLoadPreview : function(options) { var self = this; + var fileId = options.fileId; var path = options.path; var mime = options.mime; var ready = options.callback; @@ -1880,6 +1890,7 @@ urlSpec = {}; ready(iconURL); // set mimeicon URL + urlSpec.fileId = fileId; urlSpec.file = OCA.Files.Files.fixPath(path); if (options.x) { urlSpec.x = options.x; diff --git a/apps/files/js/sidebarpreviewmanager.js b/apps/files/js/sidebarpreviewmanager.js index 2cf4248897a..27ccd4fc405 100644 --- a/apps/files/js/sidebarpreviewmanager.js +++ b/apps/files/js/sidebarpreviewmanager.js @@ -92,6 +92,7 @@ }; this._fileList.lazyLoadPreview({ + fileId: model.get('id'), path: model.getFullPath(), mime: model.get('mimetype'), etag: model.get('etag'), |