Skip to content

[stable23] Always check for OCA.Files before using it (Fixes: #1106) #1108

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
mejo- merged 1 commit into from
Dec 21, 2021
Merged

[stable23] Always check for OCA.Files before using it (Fixes: #1106) #1108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Always check for OCA.Files before using it (Fixes: #1106) 
Signed-off-by: Jonas Meurer <[email protected]>
Signed-off-by: nextcloud-command <[email protected]>
  • Loading branch information
@mejo- @nextcloud-command
mejo- authored and nextcloud-command committed Dec 21, 2021
commit 6fbd987efd7b43b8650fa34236e9ebb0b856a05e
4 changes: 2 additions & 2 deletions js/viewer-main.js
View file
Open in desktop

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions src/views/Viewer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ export default {
this.isLoaded = true

// bind Sidebar if available
if (OCA.Files && OCA.Files.Sidebar) {
if (OCA?.Files?.Sidebar) {
this.Sidebar = OCA.Files.Sidebar.state
}
})
Expand Down Expand Up @@ -365,7 +365,7 @@ export default {
this.cancelRequestFile()
this.cancelRequestFolder()

if (OCA.Files.Sidebar) {
if (OCA?.Files?.Sidebar) {
OCA.Files.Sidebar.setFullScreenMode(true)
}

Expand Down Expand Up @@ -650,7 +650,7 @@ export default {
// which then triggers cleanup.
OCA.Viewer.close()

if (OCA.Files.Sidebar) {
if (OCA?.Files?.Sidebar) {
OCA.Files.Sidebar.setFullScreenMode(false)
}
},
Expand Down Expand Up @@ -739,7 +739,7 @@ export default {
// Open the sidebar sharing tab
// TODO: also hide figure, needs a proper method for it in server Sidebar

if (OCA.Files.Sidebar) {
if (OCA?.Files?.Sidebar) {
await OCA.Files.Sidebar.open(this.currentFile.filename)
}
},
Expand Down