From 2b4c11fa74ec84cddf32a840e5f63c69d606af42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Mon, 27 Jul 2020 17:52:14 +0200 Subject: [PATCH] Always update versions tab when the file is open MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- css/viewer.scss | 9 ++++++++- src/view/FilesAppIntegration.js | 6 +++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/css/viewer.scss b/css/viewer.scss index 88f1e2c06..bcda25c48 100644 --- a/css/viewer.scss +++ b/css/viewer.scss @@ -124,8 +124,15 @@ padding-left: 12px; } -#currentVersion li { +#currentVersion li, +#lastSavedVersion li { border-bottom: 1px solid rgba(100,100,100,.1); + + .version-container .downloadVersion { + display: flex; + flex-direction: column; + margin-left: 12px; + } } @import 'templatePicker'; diff --git a/src/view/FilesAppIntegration.js b/src/view/FilesAppIntegration.js index f85771a0a..06b794d4d 100644 --- a/src/view/FilesAppIntegration.js +++ b/src/view/FilesAppIntegration.js @@ -391,20 +391,24 @@ export default { $(document.querySelector('#content')).on('click.revisions', '#app-sidebar .preview-container', this.showVersionPreview.bind(this)) $(document.querySelector('#content')).on('click.revisions', '#app-sidebar .downloadVersion', this.showVersionPreview.bind(this)) $(document.querySelector('#content')).on('mousedown.revisions', '#app-sidebar .revertVersion', this.restoreVersion.bind(this)) + $(document.querySelector('#content')).on('click.revisionsTab', '#app-sidebar [data-tabid=versionsTabView]', this.addCurrentVersion.bind(this)) }, removeVersionSidebarEvents() { $(document.querySelector('#content')).off('click.revisions') $(document.querySelector('#content')).off('click.revisions') $(document.querySelector('#content')).off('mousedown.revisions') + $(document.querySelector('#content')).off('click.revisionsTab') }, addCurrentVersion() { + $('#lastSavedVersion').remove() + $('#currentVersion').remove() if (this.getFileModel()) { const preview = OC.MimeType.getIconUrl(this.getFileModel().get('mimetype')) const mtime = this.getFileModel().get('mtime') $('#versionsTabView').prepend('') + + '
' + t('richdocuments', 'Last saved version') + '
') $('#versionsTabView').prepend('') $('.live-relative-timestamp').each(function() {