github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-29 11:48:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Image file names with dots were showing incorrectly in composer markdown (#8465)

Browse Source 
When uploading an image file with dots in the filename we were splitting the string on dots and getting the last of the split items as the extension-less filename. However this did not work with filenames that have dots. We now  just remove the extension using substr.
This commit is contained in:
Martin Brennan
2019-12-06 10:58:47 +10:00
committed by GitHub
parent da2b0b2882
commit e4881290be
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/lib/uploads.js.es6
View File

@ -7,8 +7,7 @@ function isGUID(value) {
} }
function imageNameFromFileName(fileName) { function imageNameFromFileName(fileName) {
const split = fileName.split("."); let name = fileName.substr(0, fileName.lastIndexOf("."));
let name = split[split.length - 2];
if (isAppleDevice() && isGUID(name)) { if (isAppleDevice() && isGUID(name)) {
name = I18n.t("upload_selector.default_image_alt_text"); name = I18n.t("upload_selector.default_image_alt_text");

30
test/javascripts/lib/uploads-test.js.es6
View File

@ -205,6 +205,11 @@ QUnit.test("getUploadMarkdown", assert => {
"![file name with space|100x200](/uploads/123/abcdef.ext)" "![file name with space|100x200](/uploads/123/abcdef.ext)"
); );
assert.equal(
testUploadMarkdown("image.file.name.with.dots.png"),
"![image.file.name.with.dots|100x200](/uploads/123/abcdef.ext)"
);
const short_url = "uploads://asdaasd.ext"; const short_url = "uploads://asdaasd.ext";
assert.equal( assert.equal(
@ -213,15 +218,18 @@ QUnit.test("getUploadMarkdown", assert => {
); );
}); });
QUnit.test("replaces GUID in image alt text on iOS", assert => { QUnit.test(
assert.equal( "getUploadMarkdown - replaces GUID in image alt text on iOS",
testUploadMarkdown("8F2B469B-6B2C-4213-BC68-57B4876365A0.jpeg"), assert => {
"![8F2B469B-6B2C-4213-BC68-57B4876365A0|100x200](/uploads/123/abcdef.ext)" assert.equal(
); testUploadMarkdown("8F2B469B-6B2C-4213-BC68-57B4876365A0.jpeg"),
"![8F2B469B-6B2C-4213-BC68-57B4876365A0|100x200](/uploads/123/abcdef.ext)"
);
sandbox.stub(Utilities, "isAppleDevice").returns(true); sandbox.stub(Utilities, "isAppleDevice").returns(true);
assert.equal( assert.equal(
testUploadMarkdown("8F2B469B-6B2C-4213-BC68-57B4876365A0.jpeg"), testUploadMarkdown("8F2B469B-6B2C-4213-BC68-57B4876365A0.jpeg"),
"![image|100x200](/uploads/123/abcdef.ext)" "![image|100x200](/uploads/123/abcdef.ext)"
); );
}); }
);