Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Correctly wrap image and resize controls inside paragraph (#8718)

This commit is contained in:
Roman Rizzi 2020-01-15 14:01:14 -03:00 committed by GitHub
parent 0f8695958b
commit 2db7b3d9c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/assets/javascripts/pretty-text/engines/discourse-markdown/resize-controls.js.es6
View File

@ -22,14 +22,14 @@ function wrapImage(tokens, index, state, imgNumber) {
tokens.splice(
index,
0,
buildToken(state, "wrap_image_open", "div", "image-wrapper", 1)
buildToken(state, "wrap_image_open", "span", "image-wrapper", 1)
);
const newElements = [];
const btnWrapper = buildToken(
state,
"wrap_button_open",
"div",
"span",
"button-wrapper",
1
);
@ -70,24 +70,14 @@ function wrapImage(tokens, index, state, imgNumber) {
newElements.push(buildToken(state, "separator_close", "span", "", -1));
}
});
newElements.push(buildToken(state, "wrap_button_close", "div", "", -1));
newElements.push(buildToken(state, "wrap_button_close", "span", "", -1));
newElements.push(buildToken(state, "wrap_image_close", "div", "", -1));
newElements.push(buildToken(state, "wrap_image_close", "span", "", -1));
const afterImageIndex = index + 2;
tokens.splice(afterImageIndex, 0, ...newElements);
}
function removeParagraph(tokens, imageIndex) {
if (
tokens[imageIndex - 1] &&
tokens[imageIndex - 1].type === "paragraph_open"
)
tokens.splice(imageIndex - 1, 1);
if (tokens[imageIndex] && tokens[imageIndex].type === "paragraph_close")
tokens.splice(imageIndex, 1);
}
function updateIndexes(indexes, name) {
indexes[name].push(indexes.current);
indexes.current++;
@ -97,7 +87,6 @@ function wrapImages(tokens, tokenIndexes, state, imgNumberIndexes) {
//We do this in reverse order because it's easier for #wrapImage to manipulate the tokens array.
for (let j = tokenIndexes.length - 1; j >= 0; j--) {
let index = tokenIndexes[j];
removeParagraph(tokens, index);
wrapImage(tokens, index, state, imgNumberIndexes.pop());
}
}
@ -123,7 +112,6 @@ function rule(state) {
const childrenImage = token.tag === "img";
if (childrenImage && isUpload(blockToken) && hasMetadata(token)) {
removeParagraph(state.tokens, i);
childrenIndexes.push(j);
updateIndexes(indexNumbers, "childrens");
}
@ -144,8 +132,8 @@ export function setup(helper) {
const opts = helper.getOptions();
if (opts.previewing) {
helper.whiteList([
"div.image-wrapper",
"div.button-wrapper",
"span.image-wrapper",
"span.button-wrapper",
"span[class=scale-btn]",
"span[class=scale-btn active]",
"span.separator",