supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2251 from thelounge/xpaw/canplay

Browse Source 
Render video and audio previews only after canplay event fires
This commit is contained in:
Pavel Djundik 2018-03-19 20:08:14 +02:00 committed by GitHub
commit 5d6ea4f32e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/js/renderPreview.js
View File

@ -17,15 +17,17 @@ function renderPreview(preview, msg) {
preview.shown = preview.shown && options.shouldOpenMessagePreview(preview.type); preview.shown = preview.shown && options.shouldOpenMessagePreview(preview.type);
const template = $(templates.msg_preview({preview})); const template = $(templates.msg_preview({preview}));
const image = template.find("img:first"); const image = template.find("img, video, audio").first();
if (image.length === 0) { if (image.length === 0) {
return appendPreview(preview, msg, template); return appendPreview(preview, msg, template);
} }
const loadEvent = image.prop("tagName") === "IMG" ? "load" : "canplay";
// If there is an image in preview, wait for it to load before appending it to DOM // If there is an image in preview, wait for it to load before appending it to DOM
// This is done to prevent problems keeping scroll to the bottom while images load // This is done to prevent problems keeping scroll to the bottom while images load
image.on("load.preview", () => { image.on(`${loadEvent}.preview`, () => {
image.off(".preview"); image.off(".preview");
appendPreview(preview, msg, template); appendPreview(preview, msg, template);