Skip to content

[stable28] fix: support 28 Files #709

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 1 commit into from
Mar 13, 2024
Merged

[stable28] fix: support 28 Files #709

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
fix: support 28 Files 
Signed-off-by: John Molakvoæ <[email protected]>

Signed-off-by: nextcloud-command <[email protected]>

Signed-off-by: nextcloud-command <[email protected]>
  • Loading branch information
@skjnldsv @nextcloud-command
skjnldsv authored and nextcloud-command committed Mar 13, 2024
commit 17613545dca08b654e34134fff1456ddfec1a0f4
4 changes: 2 additions & 2 deletions js/recommendations-main.js
View file
Open in desktop

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

36 changes: 17 additions & 19 deletions src/components/RecommendedFile.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,6 @@ export default {
return this.name
}
},
isFileListAvailable() {
return OCA.Files.App.fileList.changeDirectory && OCA.Files.App.fileList.scrollTo
},
path() {
return (this.directory === '/' ? '' : this.directory) + '/' + this.name
},
Expand All @@ -119,26 +116,27 @@ export default {
}
},
methods: {
changeDirectory(directory) {
// This call does not always return a promise, so we
// wrap it
return Promise.resolve(OCA.Files.App.fileList.changeDirectory(directory))
},
scrollTo(name) {
OCA.Files.App.fileList.scrollTo(name)
},
navigate() {
if (OCA.Viewer && OCA.Viewer.mimetypes.indexOf(this.mimeType) !== -1) {
OCA.Viewer.open({ path: this.path })
// If Viewer is enabled and supports this file, open directly
if (window.OCA?.Viewer && window.OCA.Viewer.mimetypes.indexOf(this.mimeType) !== -1) {
window.OCA.Viewer.open({ path: this.path })
return
}
if (this.isFileListAvailable) {
this.changeDirectory(this.directory)
.then(() => this.scrollTo(this.name))
.catch(console.error.bind(this))
} else {
window.location = generateUrl('/f/' + this.id)

// Navigate to the file if the file router is available
if (window.OCP?.Files?.Router) {
window.OCP.Files.Router.goToRoute(
// use default route
null,
// recommendations is only enabled on files
{ view: 'files', fileid: this.id },
{ dir: this.directory },
)
return
}

// Fallback to the old way of navigating to the file
window.location = generateUrl('/f/' + this.id)
},
},
}
Expand Down
7 changes: 3 additions & 4 deletions src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,10 @@ const header = new Header({
// Load recommendations
store.dispatch('fetchRecommendations')

const vm = new View({
propsData: {},
new View({
name: 'RecommendationsHeader',
store,
})
vm.$mount(el)
}).$mount(el)

// Create settings
const SettingsView = Vue.extend(Settings)
Expand Down