IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-01 13:09:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "DEV: Add crossOrigin to video tag (#20617)" (#20624)

Browse Source 
This reverts commit f6063c684b.

Videos on sites with a cdn enabled aren't playing w/ a default cdn
config. They are showing a "CORS request did not succeed" error.
This commit is contained in:
Blake Erickson 2023-03-09 16:20:35 -07:00 committed by GitHub
parent 4350a903ec
commit 2d0ad48dd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/tests/unit/lib/pretty-text-test.js
View File

@ -1048,7 +1048,7 @@ eviltrout</p>
assert.cooked( assert.cooked(
"![baby shark|video](upload://eyPnj7UzkU0AkGkx2dx8G4YM1Jx.mp4)", "![baby shark|video](upload://eyPnj7UzkU0AkGkx2dx8G4YM1Jx.mp4)",
`<p><div class="video-container"> `<p><div class="video-container">
<video width="100%" height="100%" preload="metadata" crossorigin="anonymous" controls> <video width="100%" height="100%" preload="metadata" controls>
<source src="/404" data-orig-src="upload://eyPnj7UzkU0AkGkx2dx8G4YM1Jx.mp4"> <source src="/404" data-orig-src="upload://eyPnj7UzkU0AkGkx2dx8G4YM1Jx.mp4">
<a href="/404">/404</a> <a href="/404">/404</a>
</video> </video>
@ -1074,7 +1074,7 @@ eviltrout</p>
lookupUploadUrls, lookupUploadUrls,
}, },
`<p><div class="video-container"> `<p><div class="video-container">
<video width="100%" height="100%" preload="metadata" crossorigin="anonymous" controls> <video width="100%" height="100%" preload="metadata" controls>
<source src="/secure-uploads/original/3X/c/b/test.mp4"> <source src="/secure-uploads/original/3X/c/b/test.mp4">
<a href="/secure-uploads/original/3X/c/b/test.mp4">/secure-uploads/original/3X/c/b/test.mp4</a> <a href="/secure-uploads/original/3X/c/b/test.mp4">/secure-uploads/original/3X/c/b/test.mp4</a>
</video> </video>

2
app/assets/javascripts/pretty-text/addon/engines/discourse-markdown-it.js
View File

@ -160,7 +160,7 @@ function videoHTML(token) {
const origSrc = token.attrGet("data-orig-src"); const origSrc = token.attrGet("data-orig-src");
const dataOrigSrcAttr = origSrc !== null ? `data-orig-src="${origSrc}"` : ""; const dataOrigSrcAttr = origSrc !== null ? `data-orig-src="${origSrc}"` : "";
return `<div class="video-container"> return `<div class="video-container">
<video width="100%" height="100%" preload="metadata" crossOrigin="anonymous" controls> <video width="100%" height="100%" preload="metadata" controls>
<source src="${src}" ${dataOrigSrcAttr}> <source src="${src}" ${dataOrigSrcAttr}>
<a href="${src}">${src}</a> <a href="${src}">${src}</a>
</video> </video>