diff options
Diffstat (limited to 'apps/files_versions/src')
| -rw-r--r-- | apps/files_versions/src/components/Version.vue | 14 | ||||
| -rw-r--r-- | apps/files_versions/src/files_versions_tab.js | 3 | ||||
| -rw-r--r-- | apps/files_versions/src/utils/davRequest.js | 1 | ||||
| -rw-r--r-- | apps/files_versions/src/utils/versions.js | 2 | ||||
| -rw-r--r-- | apps/files_versions/src/views/VersionTab.vue | 9 |
5 files changed, 26 insertions, 3 deletions
diff --git a/apps/files_versions/src/components/Version.vue b/apps/files_versions/src/components/Version.vue index def5abbcf48..ec03a1c2b31 100644 --- a/apps/files_versions/src/components/Version.vue +++ b/apps/files_versions/src/components/Version.vue @@ -23,11 +23,15 @@ :force-display-actions="true" data-files-versions-version> <template #icon> - <img v-if="!previewError" + <div v-if="!(loadPreview || previewLoaded)" class="version__image" /> + <img v-else-if="isCurrent || version.hasPreview" :src="previewURL" alt="" + decoding="async" + fetchpriority="low" + loading="lazy" class="version__image" - @error="previewError = true"> + @load="previewLoaded = true"> <div v-else class="version__image"> <ImageOffOutline :size="20" /> @@ -182,13 +186,17 @@ export default { type: Boolean, default: false, }, + loadPreview: { + type: Boolean, + default: false, + }, }, data() { return { + previewLoaded: false, showVersionLabelForm: false, formVersionLabelValue: this.version.label, capabilities: loadState('core', 'capabilities', { files: { version_labeling: false, version_deletion: false } }), - previewError: false, } }, computed: { diff --git a/apps/files_versions/src/files_versions_tab.js b/apps/files_versions/src/files_versions_tab.js index 225add57252..8b816746401 100644 --- a/apps/files_versions/src/files_versions_tab.js +++ b/apps/files_versions/src/files_versions_tab.js @@ -59,6 +59,9 @@ window.addEventListener('DOMContentLoaded', function() { update(fileInfo) { TabInstance.update(fileInfo) }, + setIsActive(isActive) { + TabInstance.setIsActive(isActive) + }, destroy() { TabInstance.$destroy() TabInstance = null diff --git a/apps/files_versions/src/utils/davRequest.js b/apps/files_versions/src/utils/davRequest.js index fb2126d98bf..fec64caa2d5 100644 --- a/apps/files_versions/src/utils/davRequest.js +++ b/apps/files_versions/src/utils/davRequest.js @@ -30,5 +30,6 @@ export default `<?xml version="1.0"?> <d:getcontenttype /> <d:getlastmodified /> <nc:version-label /> + <nc:has-preview /> </d:prop> </d:propfind>` diff --git a/apps/files_versions/src/utils/versions.js b/apps/files_versions/src/utils/versions.js index 1a5dde10824..71593dd0ce8 100644 --- a/apps/files_versions/src/utils/versions.js +++ b/apps/files_versions/src/utils/versions.js @@ -36,6 +36,7 @@ import moment from '@nextcloud/moment' * @property {string} size - Human readable size * @property {string} type - 'file' * @property {number} mtime - Version creation date as a timestamp + * @property {boolean} hasPreview - Whether the version has a preview * @property {string} preview - Preview URL of the version * @property {string} url - Download URL of the version * @property {string|null} fileVersion - The version id, null for the current version @@ -98,6 +99,7 @@ function formatVersion(version, fileInfo) { size: version.size, type: version.type, mtime: moment(version.lastmod).unix() * 1000, + hasPreview: version.props['has-preview'] === 1, preview: generateUrl('/apps/files_versions/preview?file={file}&version={fileVersion}', { file: joinPaths(fileInfo.path, fileInfo.name), fileVersion: version.basename, diff --git a/apps/files_versions/src/views/VersionTab.vue b/apps/files_versions/src/views/VersionTab.vue index 04b6ecf1add..6d3b07c2f88 100644 --- a/apps/files_versions/src/views/VersionTab.vue +++ b/apps/files_versions/src/views/VersionTab.vue @@ -19,6 +19,7 @@ <ul data-files-versions-versions-list> <Version v-for="version in orderedVersions" :key="version.mtime" + :load-preview="isActive" :version="version" :file-info="fileInfo" :is-current="version.mtime === fileInfo.mtime" @@ -42,6 +43,7 @@ export default { data() { return { fileInfo: null, + isActive: false, /** @type {import('../utils/versions.js').Version[]} */ versions: [], loading: false, @@ -90,6 +92,13 @@ export default { }, /** + * @param {boolean} isActive whether the tab is active + */ + async setIsActive(isActive) { + this.isActive = isActive + }, + + /** * Get the existing versions infos */ async fetchVersions() { |