Skip to content
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

Jump to bottom

Improvements on images/attachments #834

Merged
merged 4 commits into from
Mar 26, 2022
Merged

Improvements on images/attachments #834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6cfdc1d
fix images from Text app
korelstar Mar 19, 2022
53ecbba
rename JavaScript methods
korelstar Mar 20, 2022
3e991d4
fix images with space in file name
korelstar Mar 20, 2022
ad0d095
design: do not center images
korelstar Mar 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/components/EditorEasyMDE.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
<ActionButton
icon="icon-upload"
:close-after-click="true"
@click="onClickUpload"
@click="onClickUploadImage"
>
{{ t('notes', 'Upload image') }}
</ActionButton>
<ActionButton
icon="icon-picture"
:close-after-click="true"
@click="onClickSelect"
@click="onClickInsertImage"
>
{{ t('notes', 'Insert image') }}
</ActionButton>
Expand Down Expand Up @@ -171,7 +171,7 @@ export default {
}
},

async onClickSelect() {
async onClickInsertImage() {
const apppath = '/' + store.state.app.settings.notesPath + '/'
const currentNotePath = apppath + this.notecategory

Expand All @@ -190,7 +190,8 @@ export default {
}
const label = basename(path)
const relativePath = relative(currentNotePath, path)
doc.replaceRange('![' + label + '](' + relativePath + ')\n', { line: cursor.line })
const encodedPath = relativePath.split('/').map(encodeURIComponent).join('/')
doc.replaceRange('![' + label + '](' + encodedPath + ')\n', { line: cursor.line })
this.mde.codemirror.focus()
},
false,
Expand All @@ -201,7 +202,7 @@ export default {
)
},

async onClickUpload() {
async onClickUploadImage() {
const cm = this.mde.codemirror
const doc = this.mde.codemirror.getDoc()
const cursor = this.mde.codemirror.getCursor()
Expand Down
49 changes: 29 additions & 20 deletions src/components/EditorMarkdownIt.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,25 +63,38 @@ export default {
// If you are sure other plugins can't add `target` - drop check below
const token = tokens[idx]
const aIndex = token.attrIndex('src')
let download = false
let path = token.attrs[aIndex][1]

if (!path.startsWith('http')) {
path = generateUrl('apps/notes/notes/{id}/attachment?path={path}', { id, path })
if (!path.startsWith('http://')
&& !path.startsWith('https://')
&& !path.startsWith('data:')
) {
path = path.split('?').shift()
const lowecasePath = path.toLowerCase()
path = generateUrl(
'apps/notes/notes/{id}/attachment?path={path}',
{ id, path: decodeURIComponent(path) },
)
token.attrs[aIndex][1] = path

if (!lowecasePath.endsWith('.jpg')
&& !lowecasePath.endsWith('.jpeg')
&& !lowecasePath.endsWith('.bmp')
&& !lowecasePath.endsWith('.webp')
&& !lowecasePath.endsWith('.gif')
&& !lowecasePath.endsWith('.png')
) {
download = true
}
}

token.attrs[aIndex][1] = path
const lowecasePath = path.toLowerCase()
// pass token to default renderer.
if (lowecasePath.endsWith('jpg')
|| lowecasePath.endsWith('jpeg')
|| lowecasePath.endsWith('bmp')
|| lowecasePath.endsWith('webp')
|| lowecasePath.endsWith('gif')
|| lowecasePath.endsWith('png')) {
return defaultRender(tokens, idx, options, env, self)
} else {
if (download) {
const dlimgpath = generateUrl('svg/core/actions/download?color=ffffff')
return '<div class="download-file"><a href="' + path.replace(/"/g, '&quot;') + '"><div class="download-icon"><img class="download-icon-inner" src="' + dlimgpath + '">' + token.content + '</div></a></div>'
} else {
// pass token to default renderer.
return defaultRender(tokens, idx, options, env, self)
}
}
},
Expand Down Expand Up @@ -189,36 +202,32 @@ export default {

& img {
width: 75%;
margin-left: auto;
margin-right: auto;
display: block;
}

.download-file {
width: 75%;
margin-left: auto;
margin-right: auto;
display: block;
text-align: center;
}

.download-icon {
padding: 15px;
margin-left: auto;
margin-right: auto;
width: 75%;
border-radius: 10px;
background-color: var(--color-background-dark);
border: 1px solid transparent; // so that it does not move on hover
}

.download-icon:hover {
border: 1px var(--color-primary-element) solid;
border-color: var(--color-primary-element);
}

.download-icon-inner {
height: 3em;
width: auto;
margin-left: auto;
margin-right: auto;
margin-bottom: 5px;
}

Expand Down