self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2026-06-18 20:16:34 +02:00
Code Issues Releases Activity

Desktop: Fixes #10733: Fix not-yet-created images lost while editing with the Rich Text Editor (#10734)

Browse Source
This commit is contained in:
Henry Heino
2024-07-16 19:25:23 +01:00
committed by GitHub
parent 9ad1249f11
commit 624bfd9175
10 changed files with 168 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/renderer/MdToHtml/rules/html_image.ts
+1 -1
View File
@@ -3,7 +3,7 @@ import { attributesHtml } from '../../htmlUtils';
import * as utils from '../../utils';
function renderImageHtml(before: string, src: string, after: string, ruleOptions: RuleOptions) {
const r = utils.imageReplacement(ruleOptions.ResourceModel, src, ruleOptions.resources, ruleOptions.resourceBaseUrl, ruleOptions.itemIdToUrl);
const r = utils.imageReplacement(ruleOptions.ResourceModel, { src, before, after }, ruleOptions.resources, ruleOptions.resourceBaseUrl, ruleOptions.itemIdToUrl);
if (typeof r === 'string') return r;
if (r) return `<img ${before} ${attributesHtml(r)} ${after}/>`;
return `[Image: ${src}]`;
packages/renderer/MdToHtml/rules/image.ts
+3 -2
View File
@@ -17,7 +17,8 @@ function plugin(markdownIt: any, ruleOptions: RuleOptions) {
if (!Resource.isResourceUrl(src) || ruleOptions.plainResourceRendering) return defaultRender(tokens, idx, options, env, self);
const r = utils.imageReplacement(ruleOptions.ResourceModel, src, ruleOptions.resources, ruleOptions.resourceBaseUrl, ruleOptions.itemIdToUrl);
const alt = token.content;
const r = utils.imageReplacement(ruleOptions.ResourceModel, { src, alt, title }, ruleOptions.resources, ruleOptions.resourceBaseUrl, ruleOptions.itemIdToUrl);
if (typeof r === 'string') return r;
if (r) {
const id = r['data-resource-id'];
@@ -35,7 +36,7 @@ function plugin(markdownIt: any, ruleOptions: RuleOptions) {
destroyEditPopupSyntax: ruleOptions.destroyEditPopupSyntax,
}, null);
return `<img data-from-md ${attributesHtml({ ...r, title: title, alt: token.content })} ${js}/>`;
return `<img data-from-md ${attributesHtml({ ...r, title: title, alt })} ${js}/>`;
}
return defaultRender(tokens, idx, options, env, self);
};