mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
removed all vibrant references (dead module)
This commit is contained in:
parent
ce51c8012d
commit
1da48cd363
16 changed files with 11 additions and 163 deletions
|
@ -132,8 +132,7 @@ define(["loading", "libraryBrowser", "cardBuilder", "dom", "apphost", "imageLoad
|
||||||
overlayMoreButton: section.overlayMoreButton && !cardLayout,
|
overlayMoreButton: section.overlayMoreButton && !cardLayout,
|
||||||
action: section.action,
|
action: section.action,
|
||||||
allowBottomPadding: !enableScrollX(),
|
allowBottomPadding: !enableScrollX(),
|
||||||
cardLayout: cardLayout,
|
cardLayout: cardLayout
|
||||||
vibrant: supportsImageAnalysis && cardLayout
|
|
||||||
}), html += "</div>"
|
}), html += "</div>"
|
||||||
}
|
}
|
||||||
elem.innerHTML = html, imageLoader.lazyChildren(elem)
|
elem.innerHTML = html, imageLoader.lazyChildren(elem)
|
||||||
|
|
|
@ -30,9 +30,7 @@ define(['lazyLoader', 'imageFetcher', 'layoutManager', 'browser', 'appSettings',
|
||||||
function fillImageElement(elem, source, enableEffects) {
|
function fillImageElement(elem, source, enableEffects) {
|
||||||
imageFetcher.loadImage(elem, source).then(function () {
|
imageFetcher.loadImage(elem, source).then(function () {
|
||||||
|
|
||||||
var fillingVibrant = false;//fillVibrant(elem, source);
|
if (enableFade && enableEffects !== false) {
|
||||||
|
|
||||||
if (enableFade && enableEffects !== false && !fillingVibrant) {
|
|
||||||
fadeIn(elem);
|
fadeIn(elem);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -40,131 +38,6 @@ define(['lazyLoader', 'imageFetcher', 'layoutManager', 'browser', 'appSettings',
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function fillVibrant(img, url, canvas, canvasContext) {
|
|
||||||
|
|
||||||
var vibrantElement = img.getAttribute('data-vibrant');
|
|
||||||
if (!vibrantElement) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (window.Vibrant) {
|
|
||||||
fillVibrantOnLoaded(img, url, vibrantElement, canvas, canvasContext);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
require(['vibrant'], function () {
|
|
||||||
fillVibrantOnLoaded(img, url, vibrantElement, canvas, canvasContext);
|
|
||||||
});
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
function fillVibrantOnLoaded(img, url, vibrantElement) {
|
|
||||||
|
|
||||||
vibrantElement = document.getElementById(vibrantElement);
|
|
||||||
if (!vibrantElement) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
requestIdleCallback(function () {
|
|
||||||
|
|
||||||
//var now = new Date().getTime();
|
|
||||||
getVibrantInfoFromElement(img, url).then(function (vibrantInfo) {
|
|
||||||
|
|
||||||
var swatch = vibrantInfo.split('|');
|
|
||||||
//console.log('vibrant took ' + (new Date().getTime() - now) + 'ms');
|
|
||||||
if (swatch.length) {
|
|
||||||
|
|
||||||
var index = 0;
|
|
||||||
var style = vibrantElement.style;
|
|
||||||
style.backgroundColor = swatch[index];
|
|
||||||
style.color = swatch[index + 1];
|
|
||||||
|
|
||||||
var classList = vibrantElement.classList;
|
|
||||||
|
|
||||||
if (classList.contains('cardFooter')) {
|
|
||||||
classList.add('cardFooter-vibrant');
|
|
||||||
} else {
|
|
||||||
classList.add('vibrant');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
/*
|
|
||||||
* Results into:
|
|
||||||
* Vibrant #7a4426
|
|
||||||
* Muted #7b9eae
|
|
||||||
* DarkVibrant #348945
|
|
||||||
* DarkMuted #141414
|
|
||||||
* LightVibrant #f3ccb4
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
|
|
||||||
function getVibrantInfoFromElement(elem, url) {
|
|
||||||
|
|
||||||
return new Promise(function (resolve, reject) {
|
|
||||||
|
|
||||||
require(['vibrant'], function () {
|
|
||||||
|
|
||||||
if (elem.tagName === 'IMG') {
|
|
||||||
resolve(getVibrantInfo(elem, url));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var img = new Image();
|
|
||||||
img.onload = function () {
|
|
||||||
resolve(getVibrantInfo(img, url));
|
|
||||||
};
|
|
||||||
img.src = url;
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function getSettingsKey(url) {
|
|
||||||
|
|
||||||
var parts = url.split('://');
|
|
||||||
url = parts[parts.length - 1];
|
|
||||||
|
|
||||||
url = url.substring(url.indexOf('/') + 1);
|
|
||||||
|
|
||||||
url = url.split('?')[0];
|
|
||||||
|
|
||||||
var cacheKey = 'vibrant31';
|
|
||||||
//cacheKey = 'vibrant' + new Date().getTime();
|
|
||||||
return cacheKey + url;
|
|
||||||
}
|
|
||||||
|
|
||||||
function getCachedVibrantInfo(url) {
|
|
||||||
|
|
||||||
return appSettings.get(getSettingsKey(url));
|
|
||||||
}
|
|
||||||
|
|
||||||
function getVibrantInfo(img, url) {
|
|
||||||
|
|
||||||
var value = getCachedVibrantInfo(url);
|
|
||||||
if (value) {
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
var vibrant = new Vibrant(img);
|
|
||||||
var swatches = vibrant.swatches();
|
|
||||||
|
|
||||||
value = '';
|
|
||||||
var swatch = swatches.DarkVibrant;
|
|
||||||
value += getSwatchString(swatch);
|
|
||||||
|
|
||||||
appSettings.set(getSettingsKey(url), value);
|
|
||||||
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
function getSwatchString(swatch) {
|
|
||||||
|
|
||||||
if (swatch) {
|
|
||||||
return swatch.getHex() + '|' + swatch.getBodyTextColor() + '|' + swatch.getTitleTextColor();
|
|
||||||
}
|
|
||||||
return '||';
|
|
||||||
}
|
|
||||||
|
|
||||||
function fadeIn(elem) {
|
function fadeIn(elem) {
|
||||||
|
|
||||||
var cssClass = 'lazy-image-fadein';
|
var cssClass = 'lazy-image-fadein';
|
||||||
|
@ -248,8 +121,6 @@ define(['lazyLoader', 'imageFetcher', 'layoutManager', 'browser', 'appSettings',
|
||||||
self.lazyImage = fillImage;
|
self.lazyImage = fillImage;
|
||||||
self.lazyChildren = lazyChildren;
|
self.lazyChildren = lazyChildren;
|
||||||
self.getPrimaryImageAspectRatio = getPrimaryImageAspectRatio;
|
self.getPrimaryImageAspectRatio = getPrimaryImageAspectRatio;
|
||||||
self.getCachedVibrantInfo = getCachedVibrantInfo;
|
|
||||||
self.getVibrantInfoFromElement = getVibrantInfoFromElement;
|
|
||||||
|
|
||||||
return self;
|
return self;
|
||||||
});
|
});
|
|
@ -167,7 +167,6 @@ define(["appRouter", "cardBuilder", "dom", "globalize", "connectionManager", "ap
|
||||||
action: section.action,
|
action: section.action,
|
||||||
allowBottomPadding: !enableScrollX(),
|
allowBottomPadding: !enableScrollX(),
|
||||||
cardLayout: cardLayout,
|
cardLayout: cardLayout,
|
||||||
vibrant: supportsImageAnalysis && cardLayout,
|
|
||||||
leadingButtons: leadingButtons,
|
leadingButtons: leadingButtons,
|
||||||
lines: lines
|
lines: lines
|
||||||
})
|
})
|
||||||
|
|
|
@ -41,7 +41,6 @@ define(["browser", "layoutManager", "userSettings", "inputManager", "loading", "
|
||||||
overlayPlayButton: !supportsImageAnalysis,
|
overlayPlayButton: !supportsImageAnalysis,
|
||||||
allowBottomPadding: !enableScrollX(),
|
allowBottomPadding: !enableScrollX(),
|
||||||
cardLayout: supportsImageAnalysis,
|
cardLayout: supportsImageAnalysis,
|
||||||
vibrant: supportsImageAnalysis,
|
|
||||||
coverImage: !0
|
coverImage: !0
|
||||||
}), imageLoader.lazyChildren(elem), loading.hide()
|
}), imageLoader.lazyChildren(elem), loading.hide()
|
||||||
})
|
})
|
||||||
|
@ -78,7 +77,6 @@ define(["browser", "layoutManager", "userSettings", "inputManager", "loading", "
|
||||||
overlayMoreButton: !supportsImageAnalysis,
|
overlayMoreButton: !supportsImageAnalysis,
|
||||||
allowBottomPadding: !enableScrollX(),
|
allowBottomPadding: !enableScrollX(),
|
||||||
cardLayout: supportsImageAnalysis,
|
cardLayout: supportsImageAnalysis,
|
||||||
vibrant: supportsImageAnalysis,
|
|
||||||
coverImage: !0
|
coverImage: !0
|
||||||
}), imageLoader.lazyChildren(itemsContainer)
|
}), imageLoader.lazyChildren(itemsContainer)
|
||||||
})
|
})
|
||||||
|
@ -115,7 +113,6 @@ define(["browser", "layoutManager", "userSettings", "inputManager", "loading", "
|
||||||
overlayMoreButton: !supportsImageAnalysis,
|
overlayMoreButton: !supportsImageAnalysis,
|
||||||
allowBottomPadding: !enableScrollX(),
|
allowBottomPadding: !enableScrollX(),
|
||||||
cardLayout: supportsImageAnalysis,
|
cardLayout: supportsImageAnalysis,
|
||||||
vibrant: supportsImageAnalysis,
|
|
||||||
coverImage: !0
|
coverImage: !0
|
||||||
}), imageLoader.lazyChildren(itemsContainer)
|
}), imageLoader.lazyChildren(itemsContainer)
|
||||||
})
|
})
|
||||||
|
|
|
@ -15,7 +15,6 @@ define(["layoutManager", "loading", "cardBuilder", "apphost", "imageLoader", "sc
|
||||||
coverImage: !0,
|
coverImage: !0,
|
||||||
cardLayout: !1,
|
cardLayout: !1,
|
||||||
centerText: !0,
|
centerText: !0,
|
||||||
vibrant: !1,
|
|
||||||
allowBottomPadding: !scrollX,
|
allowBottomPadding: !scrollX,
|
||||||
preferThumb: "auto",
|
preferThumb: "auto",
|
||||||
overlayText: !1
|
overlayText: !1
|
||||||
|
|
|
@ -19,7 +19,6 @@ define(["layoutManager", "cardBuilder", "apphost", "imageLoader", "loading", "sc
|
||||||
coverImage: !0,
|
coverImage: !0,
|
||||||
cardLayout: cardLayout,
|
cardLayout: cardLayout,
|
||||||
centerText: !cardLayout,
|
centerText: !cardLayout,
|
||||||
vibrant: cardLayout && supportsImageAnalysis,
|
|
||||||
allowBottomPadding: !enableScrollX(),
|
allowBottomPadding: !enableScrollX(),
|
||||||
preferThumb: "auto"
|
preferThumb: "auto"
|
||||||
}, cardOptions || {})), imageLoader.lazyChildren(recordingItems)
|
}, cardOptions || {})), imageLoader.lazyChildren(recordingItems)
|
||||||
|
|
|
@ -80,8 +80,7 @@ define(["loading", "events", "libraryBrowser", "imageLoader", "listView", "cardB
|
||||||
context: "movies",
|
context: "movies",
|
||||||
lazy: !0,
|
lazy: !0,
|
||||||
cardLayout: !0,
|
cardLayout: !0,
|
||||||
showTitle: !0,
|
showTitle: !0
|
||||||
vibrant: !0
|
|
||||||
}) : "Banner" == viewStyle ? cardBuilder.getCardsHtml({
|
}) : "Banner" == viewStyle ? cardBuilder.getCardsHtml({
|
||||||
items: result.Items,
|
items: result.Items,
|
||||||
shape: "banner",
|
shape: "banner",
|
||||||
|
@ -98,8 +97,7 @@ define(["loading", "events", "libraryBrowser", "imageLoader", "listView", "cardB
|
||||||
context: "movies",
|
context: "movies",
|
||||||
showTitle: !0,
|
showTitle: !0,
|
||||||
centerText: !1,
|
centerText: !1,
|
||||||
cardLayout: !0,
|
cardLayout: !0
|
||||||
vibrant: !0
|
|
||||||
}) : cardBuilder.getCardsHtml({
|
}) : cardBuilder.getCardsHtml({
|
||||||
items: result.Items,
|
items: result.Items,
|
||||||
shape: "auto",
|
shape: "auto",
|
||||||
|
|
|
@ -80,7 +80,6 @@ define(["layoutManager", "loading", "libraryBrowser", "cardBuilder", "lazyLoader
|
||||||
scalable: !0,
|
scalable: !0,
|
||||||
centerText: !1,
|
centerText: !1,
|
||||||
cardLayout: !0,
|
cardLayout: !0,
|
||||||
vibrant: supportsImageAnalysis,
|
|
||||||
showYear: !0
|
showYear: !0
|
||||||
}) : "PosterCard" == viewStyle ? cardBuilder.buildCards(result.Items, {
|
}) : "PosterCard" == viewStyle ? cardBuilder.buildCards(result.Items, {
|
||||||
itemsContainer: elem,
|
itemsContainer: elem,
|
||||||
|
@ -89,7 +88,6 @@ define(["layoutManager", "loading", "libraryBrowser", "cardBuilder", "lazyLoader
|
||||||
scalable: !0,
|
scalable: !0,
|
||||||
centerText: !1,
|
centerText: !1,
|
||||||
cardLayout: !0,
|
cardLayout: !0,
|
||||||
vibrant: supportsImageAnalysis,
|
|
||||||
showYear: !0
|
showYear: !0
|
||||||
}) : "Poster" == viewStyle && cardBuilder.buildCards(result.Items, {
|
}) : "Poster" == viewStyle && cardBuilder.buildCards(result.Items, {
|
||||||
itemsContainer: elem,
|
itemsContainer: elem,
|
||||||
|
|
|
@ -67,8 +67,7 @@ define(["layoutManager", "loading", "events", "libraryBrowser", "imageLoader", "
|
||||||
context: "movies",
|
context: "movies",
|
||||||
cardLayout: !0,
|
cardLayout: !0,
|
||||||
showTitle: !0,
|
showTitle: !0,
|
||||||
showYear: !0,
|
showYear: !0
|
||||||
vibrant: !0
|
|
||||||
}) : "Banner" == viewStyle ? cardBuilder.getCardsHtml({
|
}) : "Banner" == viewStyle ? cardBuilder.getCardsHtml({
|
||||||
items: result.Items,
|
items: result.Items,
|
||||||
shape: "banner",
|
shape: "banner",
|
||||||
|
@ -84,8 +83,7 @@ define(["layoutManager", "loading", "events", "libraryBrowser", "imageLoader", "
|
||||||
context: "movies",
|
context: "movies",
|
||||||
showTitle: !0,
|
showTitle: !0,
|
||||||
showYear: !0,
|
showYear: !0,
|
||||||
cardLayout: !0,
|
cardLayout: !0
|
||||||
vibrant: !0
|
|
||||||
}) : cardBuilder.getCardsHtml({
|
}) : cardBuilder.getCardsHtml({
|
||||||
items: result.Items,
|
items: result.Items,
|
||||||
shape: "portrait",
|
shape: "portrait",
|
||||||
|
|
|
@ -49,15 +49,13 @@ define(["libraryBrowser", "cardBuilder", "apphost", "imageLoader", "loading"], f
|
||||||
preferThumb: !0,
|
preferThumb: !0,
|
||||||
context: "music",
|
context: "music",
|
||||||
cardLayout: !0,
|
cardLayout: !0,
|
||||||
showTitle: !0,
|
showTitle: !0
|
||||||
vibrant: !0
|
|
||||||
}) : "PosterCard" == viewStyle ? html = cardBuilder.getCardsHtml({
|
}) : "PosterCard" == viewStyle ? html = cardBuilder.getCardsHtml({
|
||||||
items: result.Items,
|
items: result.Items,
|
||||||
shape: "auto",
|
shape: "auto",
|
||||||
context: "music",
|
context: "music",
|
||||||
cardLayout: !0,
|
cardLayout: !0,
|
||||||
showTitle: !0,
|
showTitle: !0
|
||||||
vibrant: !0
|
|
||||||
}) : "Poster" == viewStyle && (html = cardBuilder.getCardsHtml({
|
}) : "Poster" == viewStyle && (html = cardBuilder.getCardsHtml({
|
||||||
items: result.Items,
|
items: result.Items,
|
||||||
shape: "auto",
|
shape: "auto",
|
||||||
|
|
|
@ -43,8 +43,7 @@ define(["libraryBrowser", "cardBuilder", "apphost", "imageLoader", "loading"], f
|
||||||
centerText: !0,
|
centerText: !0,
|
||||||
overlayPlayButton: !0,
|
overlayPlayButton: !0,
|
||||||
allowBottomPadding: !0,
|
allowBottomPadding: !0,
|
||||||
cardLayout: !1,
|
cardLayout: !1
|
||||||
vibrant: !1
|
|
||||||
});
|
});
|
||||||
var elem = context.querySelector("#items");
|
var elem = context.querySelector("#items");
|
||||||
elem.innerHTML = html, imageLoader.lazyChildren(elem), libraryBrowser.saveQueryValues(getSavedQueryKey(), query), loading.hide()
|
elem.innerHTML = html, imageLoader.lazyChildren(elem), libraryBrowser.saveQueryValues(getSavedQueryKey(), query), loading.hide()
|
||||||
|
|
|
@ -69,8 +69,7 @@ define(["loading", "listView", "cardBuilder", "libraryMenu", "libraryBrowser", "
|
||||||
shape: "square",
|
shape: "square",
|
||||||
coverImage: !0,
|
coverImage: !0,
|
||||||
showTitle: !0,
|
showTitle: !0,
|
||||||
cardLayout: !0,
|
cardLayout: !0
|
||||||
vibrant: !0
|
|
||||||
}) : "Thumb" == viewStyle ? cardBuilder.getCardsHtml({
|
}) : "Thumb" == viewStyle ? cardBuilder.getCardsHtml({
|
||||||
items: result.Items,
|
items: result.Items,
|
||||||
shape: "backdrop",
|
shape: "backdrop",
|
||||||
|
@ -83,8 +82,7 @@ define(["loading", "listView", "cardBuilder", "libraryMenu", "libraryBrowser", "
|
||||||
shape: "backdrop",
|
shape: "backdrop",
|
||||||
showTitle: !0,
|
showTitle: !0,
|
||||||
preferThumb: !0,
|
preferThumb: !0,
|
||||||
cardLayout: !0,
|
cardLayout: !0
|
||||||
vibrant: !0
|
|
||||||
}) : cardBuilder.getCardsHtml({
|
}) : cardBuilder.getCardsHtml({
|
||||||
items: result.Items,
|
items: result.Items,
|
||||||
shape: "square",
|
shape: "square",
|
||||||
|
|
|
@ -673,7 +673,6 @@ var AppInfo = {};
|
||||||
var componentsPath = "components";
|
var componentsPath = "components";
|
||||||
var paths = {
|
var paths = {
|
||||||
velocity: bowerPath + "/velocity/velocity.min",
|
velocity: bowerPath + "/velocity/velocity.min",
|
||||||
vibrant: bowerPath + "/vibrant/dist/vibrant",
|
|
||||||
ironCardList: "components/ironcardlist/ironcardlist",
|
ironCardList: "components/ironcardlist/ironcardlist",
|
||||||
scrollThreshold: "components/scrollthreshold",
|
scrollThreshold: "components/scrollthreshold",
|
||||||
playlisteditor: "components/playlisteditor/playlisteditor",
|
playlisteditor: "components/playlisteditor/playlisteditor",
|
||||||
|
|
|
@ -80,7 +80,6 @@ define(["layoutManager", "loading", "libraryBrowser", "cardBuilder", "lazyLoader
|
||||||
scalable: !0,
|
scalable: !0,
|
||||||
centerText: !1,
|
centerText: !1,
|
||||||
cardLayout: !0,
|
cardLayout: !0,
|
||||||
vibrant: supportsImageAnalysis,
|
|
||||||
showYear: !0
|
showYear: !0
|
||||||
}) : "PosterCard" == viewStyle ? cardBuilder.buildCards(result.Items, {
|
}) : "PosterCard" == viewStyle ? cardBuilder.buildCards(result.Items, {
|
||||||
itemsContainer: elem,
|
itemsContainer: elem,
|
||||||
|
@ -89,7 +88,6 @@ define(["layoutManager", "loading", "libraryBrowser", "cardBuilder", "lazyLoader
|
||||||
scalable: !0,
|
scalable: !0,
|
||||||
centerText: !1,
|
centerText: !1,
|
||||||
cardLayout: !0,
|
cardLayout: !0,
|
||||||
vibrant: supportsImageAnalysis,
|
|
||||||
showYear: !0
|
showYear: !0
|
||||||
}) : "Poster" == viewStyle && cardBuilder.buildCards(result.Items, {
|
}) : "Poster" == viewStyle && cardBuilder.buildCards(result.Items, {
|
||||||
itemsContainer: elem,
|
itemsContainer: elem,
|
||||||
|
|
|
@ -34,7 +34,6 @@ define(["loading", "components/groupedcards", "cardBuilder", "apphost", "imageLo
|
||||||
centerText: !0,
|
centerText: !0,
|
||||||
lazy: !0,
|
lazy: !0,
|
||||||
overlayPlayButton: !0,
|
overlayPlayButton: !0,
|
||||||
vibrant: !1,
|
|
||||||
lines: 2
|
lines: 2
|
||||||
});
|
});
|
||||||
var elem = context.querySelector("#latestEpisodes");
|
var elem = context.querySelector("#latestEpisodes");
|
||||||
|
|
|
@ -73,7 +73,6 @@ define(["layoutManager", "loading", "datetime", "libraryBrowser", "cardBuilder",
|
||||||
overlayText: !1,
|
overlayText: !1,
|
||||||
allowBottomPadding: allowBottomPadding,
|
allowBottomPadding: allowBottomPadding,
|
||||||
cardLayout: supportsImageAnalysis,
|
cardLayout: supportsImageAnalysis,
|
||||||
vibrant: supportsImageAnalysis,
|
|
||||||
overlayMoreButton: !0,
|
overlayMoreButton: !0,
|
||||||
missingIndicator: !1
|
missingIndicator: !1
|
||||||
}), html += "</div>", html += "</div>"
|
}), html += "</div>", html += "</div>"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue