Skip to content

Feature: Allow linking to directories #2457

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

Closed
susnux wants to merge 2 commits into from
Closed

Feature: Allow linking to directories #2457

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14b2aa3
Feature: Allow linking to directories
susnux May 27, 2022
e835c36
Merge remote-tracking branch 'origin/master' into feature/link-direct…
Jun 1, 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
Next Next commit
Feature: Allow linking to directories 
Add the ability to create links to directories from within the
link menu bubble.

Signed-off-by: Ferdinand Thiessen <[email protected]>
  • Loading branch information
@susnux
susnux committed May 30, 2022
commit 14b2aa3313fefc33ac34cd53aa3d6f3249beec8e
4 changes: 2 additions & 2 deletions src/components/MenuBubble.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ export default {
return
}
const startPath = this.filePath.split('/').slice(0, -1).join('/')
OC.dialogs.filepicker(t('text', 'Select file to link to'), (file) => {
OC.dialogs.filepicker(t('text', 'Select file or directory to link to'), (file) => {
const client = OC.Files.getClient()
client.getFileInfo(file).then((_status, fileInfo) => {
const path = optimalPath(this.filePath, `${fileInfo.path}/${fileInfo.name}`)
Expand All @@ -133,7 +133,7 @@ export default {
this.$editor.chain().setLink({ href }).focus().run()
this.hideLinkMenu()
})
}, false, [], true, undefined, startPath)
}, false, [], true, 1, startPath, { allowDirectoryChooser: true })
},
setLinkUrl() {
let url = this.linkUrl
Expand Down
5 changes: 5 additions & 0 deletions src/helpers/files.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ const optimalPath = function(from, to) {
while (current[0] === target[0]) {
current.shift()
target.shift()
// Handle case where target is the current directory
if (current.length === 0 && target.length === 0) {
return '.'
}

}
const relativePath = current.fill('..').concat(target)
const absolutePath = to.split('/')
Expand Down