Skip to content

[stable23] Fix footer not hidden when Talk sidebar is shown #617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skjnldsv merged 3 commits into from
Jun 28, 2022
Merged

[stable23] Fix footer not hidden when Talk sidebar is shown #617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d62fe4
Remove unused CSS file
danxuliu Jun 26, 2022
99e04dc
Fix footer not hidden when Talk sidebar is shown
danxuliu Jun 26, 2022
eaf6c2b
Fix main content height when Talk sidebar is not shown
danxuliu Jun 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions css/style.css
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions js/files_pdfviewer-public.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/files_pdfviewer-public.js.map
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 14 additions & 1 deletion src/public.js
View file
Open in desktop
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('body > 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