mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Merge remote-tracking branch 'upstream/master' into lazyloader

Browse source
This commit is contained in:
MrTimscampi 2020-05-07 11:01:14 +02:00
commit 7dc1cf771d
315 changed files with 10374 additions and 9194 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/components/images/imageFetcher.js Normal file
View file

@ -0,0 +1,38 @@
define(['dom'], function (dom) {
'use strict';
function loadImage(elem, url) {
if (!elem) {
return Promise.reject('elem cannot be null');
}
if (elem.tagName !== 'IMG') {
elem.style.backgroundImage = "url('" + url + "')";
return Promise.resolve();
//return loadImageIntoImg(document.createElement('img'), url).then(function () {
// elem.style.backgroundImage = "url('" + url + "')";
// return Promise.resolve();
//});
}
return loadImageIntoImg(elem, url);
}
function loadImageIntoImg(elem, url) {
return new Promise(function (resolve, reject) {
dom.addEventListener(elem, 'load', resolve, {
once: true
});
elem.setAttribute('src', url);
});
}
return {
loadImage: loadImage
};
});

17
src/components/images/imageLoader.js
View file

@ -39,10 +39,10 @@ import 'css!./style';
preloaderImg.src = url;
preloaderImg.addEventListener('load', () => {
if (elem.tagName !== "IMG") {
if (elem.tagName !== 'IMG') {
elem.style.backgroundImage = "url('" + url + "')";
} else {
elem.setAttribute("src", url);
elem.setAttribute('src', url);
}
if (userSettings.enableFastFadein()) {
@ -51,23 +51,22 @@ import 'css!./style';
elem.classList.add('lazy-image-fadein');
}
elem.removeAttribute("data-src");
preloaderImg = null;
elem.removeAttribute('data-src');
});
}
function emptyImageElement(elem) {
var url;
if (elem.tagName !== "IMG") {
url = elem.style.backgroundImage.slice(4, -1).replace(/"/g, "");
if (elem.tagName !== 'IMG') {
url = elem.style.backgroundImage.slice(4, -1).replace(/"/g, '');
elem.style.backgroundImage = 'none';
} else {
url = elem.getAttribute("src");
elem.setAttribute("src", "");
url = elem.getAttribute('src');
elem.setAttribute('src', '');
}
elem.setAttribute("data-src", url);
elem.setAttribute('data-src', url);
elem.classList.remove('lazy-image-fadein-fast');
elem.classList.remove('lazy-image-fadein');