self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-11-27 08:21:03 +02:00
Code Issues Releases Activity

Desktop: Fixes #5480: Underline was not applied when using Cmd+U in Rich Text editor

Browse Source
This commit is contained in:
Laurent Cozic 2021-09-19 12:35:06 +01:00
parent 6d981864ef
commit 87f83236cf
4 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/app-cli/tests/html_to_md/sub_sup_insert_strikethrough.html
View File

@ -1 +1 @@
X<sub>1</sub> X<sup>1</sup> <ins>Insert</ins> <s>Strike</s>
X<sub>1</sub> X<sup>1</sup> <ins>Insert</ins> <span style="text-decoration: underline;">Insert alt</span> <s>Strike</s>

2
packages/app-cli/tests/html_to_md/sub_sup_insert_strikethrough.md
View File

@ -1 +1 @@
X<sub>1</sub> X<sup>1</sup> <ins>Insert</ins> ~~Strike~~
X<sub>1</sub> X<sup>1</sup> <ins>Insert</ins> <ins>Insert alt</ins> ~~Strike~~

12
packages/turndown/src/commonmark-rules.js
View File

@ -1,4 +1,4 @@
import { repeat, isCodeBlockSpecialCase1, isCodeBlockSpecialCase2, isCodeBlock } from './utilities'
import { repeat, isCodeBlockSpecialCase1, isCodeBlockSpecialCase2, isCodeBlock, getStyleProp } from './utilities'
const Entities = require('html-entities').AllHtmlEntities;
const htmlentities = (new Entities()).encode;
@ -73,7 +73,15 @@ rules.highlight = {
// HTML to avoid any ambiguity.
rules.insert = {
filter: 'ins',
filter: function (node, options) {
// TinyMCE represents this either with an <INS> tag (when pressing the
// toolbar button) or using style "text-decoration" (when using shortcut
// Cmd+U)
//
// https://github.com/laurent22/joplin/issues/5480
if (node.nodeName === 'INS') return true;
return getStyleProp(node, 'text-decoration') === 'underline';
},
replacement: function (content, node, options) {
return '<ins>' + content + '</ins>'

13
packages/turndown/src/utilities.js
View File

@ -78,3 +78,16 @@ export function isCodeBlock(node) {
node.firstChild.nodeName === 'CODE'
)
}
export function getStyleProp(node, name) {
const style = node.getAttribute('style');
if (!style) return null;
name = name.toLowerCase();
if (!style.toLowerCase().includes(name)) return null;
const o = css.parse('div {' + style + '}');
if (!o.stylesheet.rules.length) return null;
const prop = o.stylesheet.rules[0].declarations.find(d => d.property.toLowerCase() === name);
return prop ? prop.value : null;
}