github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-10 16:13:40 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: prevent redirect when image scale btn is inside a link.

Browse Source 
Currently in composer preview, if the image scale buttons are inside a `<a>` link then it redirects to the `href` location after the image scaling task.
This commit is contained in:
Vinoth Kannan
2020-07-15 09:34:54 +05:30
parent 5bf0a0893b
commit 0058a15266
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse/app/components/composer-editor.js
View File

@ -799,10 +799,8 @@ export default Component.extend({
if (matchingPlaceholder) { if (matchingPlaceholder) {
const match = matchingPlaceholder[index]; const match = matchingPlaceholder[index];
if (!match) {
return;
}
if (match) {
const replacement = match.replace( const replacement = match.replace(
imageScaleRegex, imageScaleRegex,
`![$1|$2, ${scale}%$4]($5)` `![$1|$2, ${scale}%$4]($5)`
@ -815,6 +813,10 @@ export default Component.extend({
{ regex: imageScaleRegex, index } { regex: imageScaleRegex, index }
); );
} }
}
e.preventDefault();
return;
}); });
}, },

5
test/javascripts/acceptance/composer-test.js
View File

@ -750,7 +750,7 @@ QUnit.test("Image resizing buttons", async assert => {
let uploads = [ let uploads = [
// 0 Default markdown with dimensions- should work // 0 Default markdown with dimensions- should work
"![test|690x313](upload://test.png)", "<a href='https://example.com'>![test|690x313](upload://test.png)</a>",
// 1 Image with scaling percentage, should work // 1 Image with scaling percentage, should work
"![test|690x313,50%](upload://test.png)", "![test|690x313,50%](upload://test.png)",
// 2 image with scaling percentage and a proceeding whitespace, should work // 2 image with scaling percentage and a proceeding whitespace, should work
@ -784,7 +784,8 @@ QUnit.test("Image resizing buttons", async assert => {
); );
// Default // Default
uploads[0] = "![test|690x313, 50%](upload://test.png)"; uploads[0] =
"<a href='https://example.com'>![test|690x313, 50%](upload://test.png)</a>";
await click( await click(
find(".button-wrapper[data-image-index='0'] .scale-btn[data-scale='50']") find(".button-wrapper[data-image-index='0'] .scale-btn[data-scale='50']")
); );