TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-27 21:03:29 +03:00
Code Issues Projects Releases Wiki Activity

🐛 Fixed current styling being lost when applying markdown expansions

Browse Source 
closes https://github.com/TryGhost/Ghost/issues/10677
- adjusted the basic markdown text expansion behaviour to delete the MD chars and add a markup to the resulting range rather than deleting the whole range and re-adding it
- extracted basic markdown format behaviour into a helper function
- fixed the link markup expansion so that `[](https://example.com)` is recognised and creates a link with the URL as the text
This commit is contained in:
Kevin Ansfield 2019-04-29 13:05:04 +02:00
parent 1d9cd18e14
commit 2b1fadf757
1 changed files with 40 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
ghost/admin/lib/koenig-editor/addon/options/text-expansions.js
View File

@ -144,45 +144,40 @@ function registerInlineMarkdownTextExpansions(editor) {
} }
}); });
function matchStrongStar(editor, text) { function _addMarkdownMarkup(_this, editor, matches, markupStr) {
let {range} = editor; let {range} = editor;
let matches = text.match(/(?:^|\s)\*\*([^\s*]+|[^\s*][^*]*[^\s])\*\*/);
if (matches) {
let match = matches[0].trim(); let match = matches[0].trim();
let mdChars = (match.length - matches[1].length) / 2;
range = range.extend(-(match.length)); range = range.extend(-(match.length));
editor.run((postEditor) => { editor.run((postEditor) => {
let position = postEditor.deleteRange(range); let startPos = postEditor.deleteRange(range.head.toRange().extend(mdChars));
let bold = postEditor.builder.createMarkup('strong'); let textRange = startPos.toRange().extend(matches[1].length);
postEditor.insertTextWithMarkup(position, matches[1], [bold]); let markup = editor.builder.createMarkup(markupStr);
postEditor.addMarkupToRange(textRange, markup);
let endPos = postEditor.deleteRange(textRange.tail.toRange().extend(mdChars));
postEditor.setRange(endPos.toRange());
}); });
// must be scheduled so that the toggle isn't reset automatically // must be scheduled so that the toggle isn't reset automatically
// by mobiledoc-kit re-setting state after the range is updated // by mobiledoc-kit re-setting state after the range is updated
run.later(this, function () { run.later(_this, function () {
editor.toggleMarkup('strong'); editor.toggleMarkup(markupStr);
}, 10); }, 10);
} }
function matchStrongStar(editor, text) {
let matches = text.match(/(?:^|\s)\*\*([^\s*]+|[^\s*][^*]*[^\s])\*\*/);
if (matches) {
_addMarkdownMarkup(this, editor, matches, 'strong');
}
} }
function matchStrongUnderscore(editor, text) { function matchStrongUnderscore(editor, text) {
let {range} = editor;
let matches = text.match(/(?:^|\s)__([^\s_]+|[^\s_][^_]*[^\s])__/); let matches = text.match(/(?:^|\s)__([^\s_]+|[^\s_][^_]*[^\s])__/);
if (matches) { if (matches) {
let match = matches[0].trim(); _addMarkdownMarkup(this, editor, matches, 'strong');
range = range.extend(-(match.length));
editor.run((postEditor) => {
let position = postEditor.deleteRange(range);
let bold = postEditor.builder.createMarkup('strong');
postEditor.insertTextWithMarkup(position, matches[1], [bold]);
});
// must be scheduled so that the toggle isn't reset automatically
// by mobiledoc-kit re-setting state after the range is updated
run.later(this, function () {
editor.toggleMarkup('strong');
}, 10);
} }
} }
@ -204,141 +199,63 @@ function registerInlineMarkdownTextExpansions(editor) {
// matches[1] = "foo" // matches[1] = "foo"
let matches = text.match(/(?:^|\s)\*([^\s*]+|[^\s*][^*]*[^\s])\*/); let matches = text.match(/(?:^|\s)\*([^\s*]+|[^\s*][^*]*[^\s])\*/);
if (matches) { if (matches) {
let match = matches[0].trim(); _addMarkdownMarkup(this, editor, matches, 'em');
range = range.extend(-(match.length));
editor.run((postEditor) => {
let position = postEditor.deleteRange(range);
let em = postEditor.builder.createMarkup('em');
postEditor.insertTextWithMarkup(position, matches[1], [em]);
});
// must be scheduled so that the toggle isn't reset automatically
// by mobiledoc-kit re-setting state after the range is updated
run.later(this, function () {
editor.toggleMarkup('em');
}, 10);
} }
} }
function matchEmUnderscore(editor, text) { function matchEmUnderscore(editor, text) {
let {range} = editor;
let matches = text.match(/(?:^|\s)_([^\s_]+|[^\s_][^_]*[^\s])_/); let matches = text.match(/(?:^|\s)_([^\s_]+|[^\s_][^_]*[^\s])_/);
if (matches) { if (matches) {
let match = matches[0].trim(); _addMarkdownMarkup(this, editor, matches, 'em');
range = range.extend(-(match.length));
editor.run((postEditor) => {
let position = postEditor.deleteRange(range);
let em = postEditor.builder.createMarkup('em');
postEditor.insertTextWithMarkup(position, matches[1], [em]);
});
// must be scheduled so that the toggle isn't reset automatically
// by mobiledoc-kit re-setting state after the range is updated
run.later(this, function () {
editor.toggleMarkup('em');
}, 10);
} }
} }
function matchSub(editor, text) { function matchSub(editor, text) {
let {range} = editor; let matches = text.match(/(?:^|[^~])~([^\s~]+|[^\s~][^~]*[^\s])~/);
let matches = text.match(/(^|[^~])~([^\s~]+|[^\s~][^~]*[^\s])~/);
if (matches) { if (matches) {
let match = matches[0].trim(); _addMarkdownMarkup(this, editor, matches, 'sub');
range = range.extend(-(match.length - matches[1].trim().length));
editor.run((postEditor) => {
let position = postEditor.deleteRange(range);
let sub = postEditor.builder.createMarkup('sub');
postEditor.insertTextWithMarkup(position, matches[2], [sub]);
});
// must be scheduled so that the toggle isn't reset automatically
// by mobiledoc-kit re-setting state after the range is updated
run.later(this, function () {
editor.toggleMarkup('sub');
}, 10);
} }
} }
function matchStrikethrough(editor, text) { function matchStrikethrough(editor, text) {
let {range} = editor;
let matches = text.match(/(?:^|\s)~~([^\s~]+|[^\s~][^~]*[^\s])~~/); let matches = text.match(/(?:^|\s)~~([^\s~]+|[^\s~][^~]*[^\s])~~/);
if (matches) { if (matches) {
let match = matches[0].trim(); _addMarkdownMarkup(this, editor, matches, 's');
range = range.extend(-(match.length));
editor.run((postEditor) => {
let position = postEditor.deleteRange(range);
let s = postEditor.builder.createMarkup('s');
postEditor.insertTextWithMarkup(position, matches[1], [s]);
});
// must be scheduled so that the toggle isn't reset automatically
// by mobiledoc-kit re-setting state after the range is updated
run.later(this, function () {
editor.toggleMarkup('s');
}, 10);
} }
} }
function matchCode(editor, text) { function matchCode(editor, text) {
let {range} = editor;
let matches = text.match(/(?:^|\s)`([^\s`]+|[^\s`][^`]*[^\s`])`/); let matches = text.match(/(?:^|\s)`([^\s`]+|[^\s`][^`]*[^\s`])`/);
if (matches) { if (matches) {
let match = matches[0].trim(); _addMarkdownMarkup(this, editor, matches, 'code');
range = range.extend(-(match.length));
editor.run((postEditor) => {
let position = postEditor.deleteRange(range);
let code = postEditor.builder.createMarkup('code');
postEditor.insertTextWithMarkup(position, matches[1], [code]);
});
// must be scheduled so that the toggle isn't reset automatically
// by mobiledoc-kit re-setting state after the range is updated
run.later(this, function () {
editor.toggleMarkup('code');
}, 10);
} }
} }
function matchSup(editor, text) { function matchSup(editor, text) {
let {range} = editor;
let matches = text.match(/\^([^\s^]+|[^\s^][^^]*[^\s^])\^/); let matches = text.match(/\^([^\s^]+|[^\s^][^^]*[^\s^])\^/);
if (matches) { if (matches) {
let match = matches[0].trim(); _addMarkdownMarkup(this, editor, matches, 'sup');
range = range.extend(-(match.length));
editor.run((postEditor) => {
let position = postEditor.deleteRange(range);
let sup = postEditor.builder.createMarkup('sup');
postEditor.insertTextWithMarkup(position, matches[1], [sup]);
});
// must be scheduled so that the toggle isn't reset automatically
// by mobiledoc-kit re-setting state after the range is updated
run.later(this, function () {
editor.toggleMarkup('sup');
}, 10);
} }
} }
function matchLink(editor, text) { function matchLink(editor, text) {
let {range} = editor; let {range} = editor;
let matches = text.match(/(?:^|\s)\[([^\s\]]+|[^\s\]][^\]]*[^\s\]])\]\(([^\s)]+|[^\s)][^)]*[^\s)])\)/); let matches = text.match(/(?:^|\s)\[([^\s\]]*|[^\s\]][^\]]*[^\s\]])\]\(([^\s)]+|[^\s)][^)]*[^\s)])\)/);
if (matches) { if (matches) {
let url = matches[2]; let url = matches[2];
let text = matches[1] || url; let text = matches[1] || url;
let hasText = !!matches[1];
let match = matches[0].trim(); let match = matches[0].trim();
range = range.extend(-match.length); range = range.extend(-match.length);
editor.run((postEditor) => { editor.run((postEditor) => {
let position = postEditor.deleteRange(range); let startPos = postEditor.deleteRange(range.head.toRange().extend(hasText ? 1 : 3));
let textRange = startPos.toRange().extend(text.length);
let a = postEditor.builder.createMarkup('a', {href: url}); let a = postEditor.builder.createMarkup('a', {href: url});
postEditor.insertTextWithMarkup(position, text, [a]); postEditor.addMarkupToRange(textRange, a);
let remainingRange = textRange.tail.toRange().extend(hasText ? (matches[2] || url).length + 3 : 1);
let endPos = postEditor.deleteRange(remainingRange);
postEditor.setRange(endPos.toRange());
}); });
// must be scheduled so that the toggle isn't reset automatically // must be scheduled so that the toggle isn't reset automatically