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

FEATURE: use Markdown for image pasted in as opposed to IMG tags

Browse Source
This commit is contained in:
Sam
2017-07-25 15:11:28 -04:00
parent 0d66a41753
commit 17d56a4cb7
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/lib/utilities.js.es6
View File

@ -296,7 +296,9 @@ export function uploadLocation(url) {
export function getUploadMarkdown(upload) { export function getUploadMarkdown(upload) {
if (isAnImage(upload.original_filename)) { if (isAnImage(upload.original_filename)) {
return '<img src="' + upload.url + '" width="' + upload.width + '" height="' + upload.height + '">'; const split = upload.original_filename.split('.');
const name = split[split.length-2];
return `![${name}|${upload.width}x${upload.height}](${upload.url})`;
} else if (!Discourse.SiteSettings.prevent_anons_from_downloading_files && (/\.(mov|mp4|webm|ogv|mp3|ogg|wav|m4a)$/i).test(upload.original_filename)) { } else if (!Discourse.SiteSettings.prevent_anons_from_downloading_files && (/\.(mov|mp4|webm|ogv|mp3|ogg|wav|m4a)$/i).test(upload.original_filename)) {
return uploadLocation(upload.url); return uploadLocation(upload.url);
} else { } else {

4
test/javascripts/lib/utilities-test.js.es6
View File

@ -119,7 +119,7 @@ var testUploadMarkdown = function(filename) {
}; };
QUnit.test("getUploadMarkdown", assert => { QUnit.test("getUploadMarkdown", assert => {
assert.ok(testUploadMarkdown("lolcat.gif") === '<img src="/uploads/123/abcdef.ext" width="100" height="200">'); assert.equal(testUploadMarkdown("lolcat.gif"),'![lolcat|100x200](/uploads/123/abcdef.ext)');
assert.ok(testUploadMarkdown("important.txt") === '<a class="attachment" href="/uploads/123/abcdef.ext">important.txt</a> (42 Bytes)\n'); assert.ok(testUploadMarkdown("important.txt") === '<a class="attachment" href="/uploads/123/abcdef.ext">important.txt</a> (42 Bytes)\n');
}); });
@ -227,4 +227,4 @@ QUnit.test("caretRowCol", assert => {
assertResult(14, 3, 2); assertResult(14, 3, 2);
document.body.removeChild(textarea); document.body.removeChild(textarea);
}); });