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

FIX: Preload metadata for audio/video when secure media enabled

Browse Source 
Fixes an issue with missing video previews. Should have no side effects now that presigned URLs expire after 5 minutes.
This commit is contained in:
Penar Musaraj
2020-07-15 18:36:51 -04:00
parent 9e160f58ab
commit 36bad0c31f
2 changed files with 6 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
test/javascripts/lib/pretty-text-test.js
View File

@ -1025,33 +1025,6 @@ QUnit.test("attachment - mapped url - secure media enabled", assert => {
);
});
QUnit.test("video - secure media enabled", assert => {
assert.cookedOptions(
"![baby shark|video](upload://eyPnj7UzkU0AkGkx2dx8G4YM1Jx.mp4)",
{ siteSettings: { secure_media: true } },
`<p><div class="video-container">
<p class="video-description">baby shark</p>
<video width="100%" height="100%" preload="none" controls>
<source src="/404" data-orig-src="upload://eyPnj7UzkU0AkGkx2dx8G4YM1Jx.mp4">
<a href="/404">/404</a>
</video>
</div></p>`,
"It returns the correct video player HTML"
);
});
QUnit.test("audio - secure media enabled", assert => {
assert.cookedOptions(
"![young americans|audio](upload://eyPnj7UzkU0AkGkx2dx8G4YM1Jx.mp3)",
{ siteSettings: { secure_media: true } },
`<p><audio preload="none" controls>
<source src="/404" data-orig-src="upload://eyPnj7UzkU0AkGkx2dx8G4YM1Jx.mp3">
<a href="/404">/404</a>
</audio></p>`,
"It returns the correct audio player HTML"
);
});
QUnit.test("video", assert => {
assert.cooked(
"![baby shark|video](upload://eyPnj7UzkU0AkGkx2dx8G4YM1Jx.mp4)",
@ -1084,7 +1057,7 @@ QUnit.test("video - mapped url - secure media enabled", assert => {
},
`<p><div class="video-container">
<p class="video-description">baby shark</p>
<video width="100%" height="100%" preload="none" controls>
<video width="100%" height="100%" preload="metadata" controls>
<source src="/secure-media-uploads/original/3X/c/b/test.mp4">
<a href="/secure-media-uploads/original/3X/c/b/test.mp4">/secure-media-uploads/original/3X/c/b/test.mp4</a>
</video>
@ -1120,7 +1093,7 @@ QUnit.test("audio - mapped url - secure media enabled", assert => {
siteSettings: { secure_media: true },
lookupUploadUrls: lookupUploadUrls
},
`<p><audio preload="none" controls>
`<p><audio preload="metadata" controls>
<source src="/secure-media-uploads/original/3X/c/b/test.mp3">
<a href="/secure-media-uploads/original/3X/c/b/test.mp3">/secure-media-uploads/original/3X/c/b/test.mp3</a>
</audio></p>`,