Skip to content

Commit

Permalink
Merge pull request #618 from nextcloud/backport/615/stable22-fix-foot…
Browse files Browse the repository at this point in the history
…er-not-hidden-when-talk-sidebar-is-not-shown
  • Loading branch information
skjnldsv authored Jun 28, 2022
2 parents 6d4534f + ed7c636 commit 4759ce9
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 19 deletions.
15 changes: 0 additions & 15 deletions css/style.css

This file was deleted.

4 changes: 2 additions & 2 deletions js/files_pdfviewer-public.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/files_pdfviewer-public.js.map

Large diffs are not rendered by default.

15 changes: 14 additions & 1 deletion src/public.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,12 @@ window.addEventListener('DOMContentLoaded', function() {
const page = location.hash.split('page=')[1] || 0
const contentElmt = document.getElementById('files-public-content')
const sharingTokenElmt = document.getElementById('sharingToken')
const footerElmt = document.querySelector('#app-content > footer')
// By default the footer is a direct child of the body, but if the Talk
// sidebar is loaded it is moved into the app content. In all cases the
// footer is hidden to give the PDF viewer the full height.
const footerElmt = document.querySelector('body > footer') || document.querySelector('#app-content > footer')
const body = document.querySelector('body')
const mainContent = document.querySelector('#content')

const sharingToken = sharingTokenElmt.value
const downloadUrl = generateUrl('/s/{token}/download', { token: sharingToken })
Expand All @@ -67,6 +72,14 @@ window.addEventListener('DOMContentLoaded', function() {
contentElmt.appendChild(viewerNode)
viewerNode.src = viewerUrl
footerElmt.style.display = 'none'
// The main content height set in server assumes that there will be
// a footer. As the footer is hidden the main content needs to grow
// to take the available height. This needs to be done with flexbox
// so no explicit height needs to be given and it works both for the
// standard layout and the layout when the Talk sidebar is shown.
body.style.display = 'flex'
body.style.flexDirection = 'column'
mainContent.style.flexGrow = 1
} else {
logger.error('Unable to inject the PDF Viewer')
}
Expand Down

0 comments on commit 4759ce9

Please sign in to comment.