milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update live stream management

Browse source
This commit is contained in:
Luke Pulverenti 2016-10-07 11:08:13 -04:00
parent 170b720d0b
commit 04dda98be4
17 changed files with 159 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

18
dashboard-ui/bower_components/emby-webcomponents/images/imagehelper.js vendored
View file

@ -52,9 +52,9 @@ define(['visibleinviewport', 'imageFetcher', 'layoutManager', 'events', 'browser
imageFetcher.loadImage(elem, source).then(function () {
fillVibrant(elem, source);
var fillingVibrant = fillVibrant(elem, source);
if (enableFade && !layoutManager.tv && enableEffects !== false) {
if (enableFade && !layoutManager.tv && enableEffects !== false && !fillingVibrant) {
fadeIn(elem);
}
@ -66,30 +66,27 @@ define(['visibleinviewport', 'imageFetcher', 'layoutManager', 'events', 'browser
function fillVibrant(img, url) {
if (img.tagName != 'IMG') {
return;
return false;
}
var vibrantElement = img.getAttribute('data-vibrant');
if (!vibrantElement) {
return;
return false;
}
if (window.Vibrant) {
fillVibrantOnLoaded(img, url, vibrantElement);
return;
return true;
}
require(['vibrant'], function () {
fillVibrantOnLoaded(img, url, vibrantElement);
});
return true;
}
function fillVibrantOnLoaded(img, url, vibrantElement) {
if (img.tagName != 'IMG') {
return;
}
vibrantElement = document.getElementById(vibrantElement);
if (!vibrantElement) {
return;
@ -121,8 +118,7 @@ define(['visibleinviewport', 'imageFetcher', 'layoutManager', 'events', 'browser
url = url.split('?')[0];
console.log(url);
return 'vibrant3-' + url;
return 'vibrant5-' + url;
}
function getCachedVibrantInfo(url) {