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

rework genre views

This commit is contained in:
Luke Pulverenti 2016-11-15 14:42:43 -05:00
parent 28dbf41487
commit 0dacc82ab7
20 changed files with 541 additions and 380 deletions

View file

@ -14,12 +14,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.4.336", "version": "1.4.337",
"_release": "1.4.336", "_release": "1.4.337",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.4.336", "tag": "1.4.337",
"commit": "400863fdd7ccf3fe53c1abd8b4d4dae58bd9925d" "commit": "1653cc935acba06056afae3a6fc8bce17fb46a7a"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1", "_target": "^1.2.1",

View file

@ -1,49 +1,12 @@
define(['visibleinviewport', 'imageFetcher', 'layoutManager', 'events', 'browser', 'dom', 'appSettings', 'require'], function (visibleinviewport, imageFetcher, layoutManager, events, browser, dom, appSettings, require) { define(['lazyLoader', 'imageFetcher', 'layoutManager', 'browser', 'appSettings', 'require'], function (lazyLoader, imageFetcher, layoutManager, browser, appSettings, require) {
'use strict'; 'use strict';
var thresholdX;
var thresholdY;
var requestIdleCallback = window.requestIdleCallback || function (fn) { var requestIdleCallback = window.requestIdleCallback || function (fn) {
fn(); fn();
}; };
//var imagesWorker = new Worker(require.toUrl('.').split('?')[0] + '/imagesworker.js'); //var imagesWorker = new Worker(require.toUrl('.').split('?')[0] + '/imagesworker.js');
var supportsIntersectionObserver = function () {
if (window.IntersectionObserver) {
return true;
}
return false;
}();
function resetThresholds() {
var x = screen.availWidth;
var y = screen.availHeight;
if (browser.touch) {
x *= 1.5;
y *= 1.5;
}
thresholdX = x;
thresholdY = y;
}
if (!supportsIntersectionObserver) {
dom.addEventListener(window, "orientationchange", resetThresholds, { passive: true });
dom.addEventListener(window, 'resize', resetThresholds, { passive: true });
resetThresholds();
}
function isVisible(elem) {
return visibleinviewport(elem, true, thresholdX, thresholdY);
}
var wheelEvent = (document.implementation.hasFeature('Event.wheel', '3.0') ? 'wheel' : 'mousewheel'); var wheelEvent = (document.implementation.hasFeature('Event.wheel', '3.0') ? 'wheel' : 'mousewheel');
var self = {}; var self = {};
@ -236,135 +199,9 @@ define(['visibleinviewport', 'imageFetcher', 'layoutManager', 'events', 'browser
elem.animate(keyframes, timing); elem.animate(keyframes, timing);
} }
function cancelAll(tokens) {
for (var i = 0, length = tokens.length; i < length; i++) {
tokens[i] = true;
}
}
function unveilWithIntersection(images, root) {
var filledCount = 0;
var options = {};
//options.rootMargin = "300%";
var observer = new IntersectionObserver(function (entries) {
for (var j = 0, length2 = entries.length; j < length2; j++) {
var entry = entries[j];
var target = entry.target;
observer.unobserve(target);
fillImage(target);
filledCount++;
}
},
options
);
// Start observing an element
for (var i = 0, length = images.length; i < length; i++) {
observer.observe(images[i]);
}
}
function unveilElements(images, root) {
if (!images.length) {
return;
}
if (supportsIntersectionObserver) {
unveilWithIntersection(images, root);
return;
}
var filledImages = [];
var cancellationTokens = [];
function unveilInternal(tokenIndex) {
var anyFound = false;
var out = false;
// TODO: This out construct assumes left to right, top to bottom
for (var i = 0, length = images.length; i < length; i++) {
if (cancellationTokens[tokenIndex]) {
return;
}
if (filledImages[i]) {
continue;
}
var img = images[i];
if (!out && isVisible(img)) {
anyFound = true;
filledImages[i] = true;
fillImage(img);
} else {
if (anyFound) {
out = true;
}
}
}
if (!images.length) {
dom.removeEventListener(document, 'focus', unveil, {
capture: true,
passive: true
});
dom.removeEventListener(document, 'scroll', unveil, {
capture: true,
passive: true
});
dom.removeEventListener(document, wheelEvent, unveil, {
capture: true,
passive: true
});
dom.removeEventListener(window, 'resize', unveil, {
capture: true,
passive: true
});
}
}
function unveil() {
cancelAll(cancellationTokens);
var index = cancellationTokens.length;
cancellationTokens.length++;
setTimeout(function () {
unveilInternal(index);
}, 1);
}
dom.addEventListener(document, 'focus', unveil, {
capture: true,
passive: true
});
dom.addEventListener(document, 'scroll', unveil, {
capture: true,
passive: true
});
dom.addEventListener(document, wheelEvent, unveil, {
capture: true,
passive: true
});
dom.addEventListener(window, 'resize', unveil, {
capture: true,
passive: true
});
unveil();
}
function lazyChildren(elem) { function lazyChildren(elem) {
unveilElements(elem.getElementsByClassName('lazy'), elem); lazyLoader.lazyChildren(elem, fillImage);
} }
function getPrimaryImageAspectRatio(items) { function getPrimaryImageAspectRatio(items) {

View file

@ -0,0 +1,182 @@
define(['visibleinviewport', 'browser', 'dom'], function (visibleinviewport, browser, dom) {
'use strict';
var thresholdX;
var thresholdY;
var requestIdleCallback = window.requestIdleCallback || function (fn) {
fn();
};
var supportsIntersectionObserver = function () {
if (window.IntersectionObserver) {
return true;
}
return false;
}();
function resetThresholds() {
var x = screen.availWidth;
var y = screen.availHeight;
if (browser.touch) {
x *= 1.5;
y *= 1.5;
}
thresholdX = x;
thresholdY = y;
}
if (!supportsIntersectionObserver) {
dom.addEventListener(window, "orientationchange", resetThresholds, { passive: true });
dom.addEventListener(window, 'resize', resetThresholds, { passive: true });
resetThresholds();
}
function isVisible(elem) {
return visibleinviewport(elem, true, thresholdX, thresholdY);
}
var wheelEvent = (document.implementation.hasFeature('Event.wheel', '3.0') ? 'wheel' : 'mousewheel');
var self = {};
function cancelAll(tokens) {
for (var i = 0, length = tokens.length; i < length; i++) {
tokens[i] = true;
}
}
function unveilWithIntersection(elements, root, callback) {
var filledCount = 0;
var options = {};
//options.rootMargin = "300%";
var observer = new IntersectionObserver(function (entries) {
for (var j = 0, length2 = entries.length; j < length2; j++) {
var entry = entries[j];
var target = entry.target;
observer.unobserve(target);
callback(target);
filledCount++;
}
},
options
);
// Start observing an element
for (var i = 0, length = elements.length; i < length; i++) {
observer.observe(elements[i]);
}
}
function unveilElements(elements, root, callback) {
if (!elements.length) {
return;
}
if (supportsIntersectionObserver) {
unveilWithIntersection(elements, root, callback);
return;
}
var unveiledElements = [];
var cancellationTokens = [];
function unveilInternal(tokenIndex) {
var anyFound = false;
var out = false;
// TODO: This out construct assumes left to right, top to bottom
for (var i = 0, length = elements.length; i < length; i++) {
if (cancellationTokens[tokenIndex]) {
return;
}
if (unveiledElements[i]) {
continue;
}
var elem = elements[i];
if (!out && isVisible(elem)) {
anyFound = true;
unveiledElements[i] = true;
callback(elem);
} else {
if (anyFound) {
out = true;
}
}
}
if (!elements.length) {
dom.removeEventListener(document, 'focus', unveil, {
capture: true,
passive: true
});
dom.removeEventListener(document, 'scroll', unveil, {
capture: true,
passive: true
});
dom.removeEventListener(document, wheelEvent, unveil, {
capture: true,
passive: true
});
dom.removeEventListener(window, 'resize', unveil, {
capture: true,
passive: true
});
}
}
function unveil() {
cancelAll(cancellationTokens);
var index = cancellationTokens.length;
cancellationTokens.length++;
setTimeout(function () {
unveilInternal(index);
}, 1);
}
dom.addEventListener(document, 'focus', unveil, {
capture: true,
passive: true
});
dom.addEventListener(document, 'scroll', unveil, {
capture: true,
passive: true
});
dom.addEventListener(document, wheelEvent, unveil, {
capture: true,
passive: true
});
dom.addEventListener(window, 'resize', unveil, {
capture: true,
passive: true
});
unveil();
}
function lazyChildren(elem, callback) {
unveilElements(elem.getElementsByClassName('lazy'), elem, callback);
}
self.lazyChildren = lazyChildren;
return self;
});

View file

@ -1,7 +1,7 @@
{ {
"MessageUnlockAppWithPurchaseOrSupporter": "Unlock this feature with a small one-time purchase, or with an active Emby Premiere subscription.", "MessageUnlockAppWithPurchaseOrSupporter": "Ontgrendel deze functie met een kleine eenmalige aankoop, of met een actief Emby Premiere abonnement.",
"MessageUnlockAppWithSupporter": "Unlock this feature with an active Emby Premiere subscription.", "MessageUnlockAppWithSupporter": "Ontgrendel deze functie met een actief Emby Premiere abonnement.",
"MessageToValidateSupporter": "If you have an active Emby Premiere subscription, ensure you've setup Emby Premiere in your Emby Server Dashboard, which you can access by clicking Emby Premiere within the main menu.", "MessageToValidateSupporter": "Als u een actieve Emby Premiere abonnement heeft , zorg er dan voor dat u deze activeert in uw Emby Server Dashboard door te klikken op Emby Premiere in het hoofdmenu.",
"ValueSpecialEpisodeName": "Speciaal - {0}", "ValueSpecialEpisodeName": "Speciaal - {0}",
"Share": "Delen", "Share": "Delen",
"Add": "Toevoegen", "Add": "Toevoegen",
@ -29,7 +29,7 @@
"ButtonGotIt": "Begrepen", "ButtonGotIt": "Begrepen",
"ButtonRestart": "Herstart", "ButtonRestart": "Herstart",
"RecordingCancelled": "Opname geannuleerd.", "RecordingCancelled": "Opname geannuleerd.",
"SeriesCancelled": "Series cancelled.", "SeriesCancelled": "Serie geannuleerd.",
"RecordingScheduled": "Opname schema", "RecordingScheduled": "Opname schema",
"SeriesRecordingScheduled": "Serieopname gepland.", "SeriesRecordingScheduled": "Serieopname gepland.",
"HeaderNewRecording": "Nieuwe opname", "HeaderNewRecording": "Nieuwe opname",
@ -42,19 +42,19 @@
"Saturday": "Zaterdag", "Saturday": "Zaterdag",
"Days": "Dagen", "Days": "Dagen",
"RecordSeries": "Series Opnemen", "RecordSeries": "Series Opnemen",
"HeaderCinemaMode": "Cinema Mode", "HeaderCinemaMode": "Bioscoop mode",
"HeaderCloudSync": "Cloud Sync", "HeaderCloudSync": "Cloud Synchronisatie",
"HeaderOfflineDownloads": "Offline Media", "HeaderOfflineDownloads": "Offline Media",
"HeaderOfflineDownloadsDescription": "Download media to your devices for easy offline use.", "HeaderOfflineDownloadsDescription": "Download media naar je apparaten voor gemakkelijk offlineebruik.",
"CloudSyncFeatureDescription": "Sync your media to the cloud for easy backup, archiving, and converting.", "CloudSyncFeatureDescription": "Synchroniseer uw media naar de cloud voor eenvoudige backup, archivering en conversie.",
"CoverArtFeatureDescription": "Cover Art creates fun covers and other treatments to help you personalize your media images.", "CoverArtFeatureDescription": "Cover Art cre\u00ebert leuke covers en andere bewerkingen om u te helpen uw mediabeelden te personaliseren.",
"CoverArt": "Cover Art", "CoverArt": "Cover Art",
"CinemaModeFeatureDescription": "Cinema Mode gives you the true cinema experience with trailers and custom intros before the feature.", "CinemaModeFeatureDescription": "Bioscoop mode geeft u de ware bioscoopervaring met trailers en aangepaste intro voor de weergave van uw keuze.",
"HeaderFreeApps": "Free Emby Apps", "HeaderFreeApps": "Gratis Emby Apps",
"FreeAppsFeatureDescription": "Enjoy free access to Emby apps for your devices.", "FreeAppsFeatureDescription": "Geniet van gratis toegang tot Emby apps voor uw apparaten.",
"HeaderBecomeProjectSupporter": "Verkrijg Emby Premiere", "HeaderBecomeProjectSupporter": "Verkrijg Emby Premiere",
"MessageActiveSubscriptionRequiredSeriesRecordings": "Er is een actief Emby Premiere abonnement benodigd om een automatische serie opname aan te maken.", "MessageActiveSubscriptionRequiredSeriesRecordings": "Er is een actief Emby Premiere abonnement benodigd om een automatische serie opname aan te maken.",
"LabelEmailAddress": "E-mail address:", "LabelEmailAddress": "E-mailadres:",
"PromoConvertRecordingsToStreamingFormat": "Automatisch converteren opnames naar een streaming formaat met Emby Premiere. Opnames zullen on the fly worden omgezet naar MP4 of MKV, op basis van deEmby server instellingen.", "PromoConvertRecordingsToStreamingFormat": "Automatisch converteren opnames naar een streaming formaat met Emby Premiere. Opnames zullen on the fly worden omgezet naar MP4 of MKV, op basis van deEmby server instellingen.",
"FeatureRequiresEmbyPremiere": "Deze functie vereist een actieve Emby Premiere abonnement.", "FeatureRequiresEmbyPremiere": "Deze functie vereist een actieve Emby Premiere abonnement.",
"HeaderConvertYourRecordings": "Opnames omzetten", "HeaderConvertYourRecordings": "Opnames omzetten",
@ -293,31 +293,31 @@
"RepeatEpisodes": "Herhaal afleveringen", "RepeatEpisodes": "Herhaal afleveringen",
"DvrSubscriptionRequired": "Emby DVR vereist een actieve Emby premi\u00e8re-abonnement.", "DvrSubscriptionRequired": "Emby DVR vereist een actieve Emby premi\u00e8re-abonnement.",
"HeaderCancelRecording": "Opname Annuleren", "HeaderCancelRecording": "Opname Annuleren",
"CancelRecording": "Cancel recording", "CancelRecording": "Opname annuleren",
"HeaderKeepRecording": "Bewaar opname", "HeaderKeepRecording": "Bewaar opname",
"HeaderCancelSeries": "Cancel Series", "HeaderCancelSeries": "Annuleren Series",
"HeaderKeepSeries": "Keep Series", "HeaderKeepSeries": "Series behouden",
"HeaderLearnMore": "Meer informatie", "HeaderLearnMore": "Meer informatie",
"DeleteMedia": "Verwijder media", "DeleteMedia": "Verwijder media",
"SeriesSettings": "Series instellingen", "SeriesSettings": "Series instellingen",
"HeaderRecordingOptions": "Opname instellingen", "HeaderRecordingOptions": "Opname instellingen",
"CancelSeries": "Cancel series", "CancelSeries": "Cancel series",
"DoNotRecord": "Do not record", "DoNotRecord": "Niet opnemen",
"HeaderSeriesOptions": "Series Options", "HeaderSeriesOptions": "Series Opties",
"LabelChannels": "Channels:", "LabelChannels": "Kanalen:",
"ChannelNameOnly": "Channel {0} only", "ChannelNameOnly": "Alleen kanaal {0}",
"Anytime": "Anytime", "Anytime": "Op elk moment",
"AroundTime": "Around {0}", "AroundTime": "Rond {0}",
"LabelAirtime": "Airtime:", "LabelAirtime": "Uitzendtijd:",
"AllChannels": "All channels", "AllChannels": "Alle kanalen",
"LabelRecord": "Record:", "LabelRecord": "Opnemen:",
"NewEpisodesOnly": "New episodes only", "NewEpisodesOnly": "Alleen nieuwe afleveringen",
"AllEpisodes": "All episodes", "AllEpisodes": "Alle afleveringen",
"LabelStartWhenPossible": "Start when possible:", "LabelStartWhenPossible": "Start indien mogelijk:",
"LabelStopWhenPossible": "Stop when possible:", "LabelStopWhenPossible": "Stop indien mogelijk:",
"MinutesBefore": "minutes before", "MinutesBefore": "minuten voor",
"MinutesAfter": "minutes after", "MinutesAfter": "minuten na",
"SkipEpisodesAlreadyInMyLibrary": "Skip episodes that are already in my library", "SkipEpisodesAlreadyInMyLibrary": "Sla afleveringen over die al in mijn bibliotheek voorkomen",
"SkipEpisodesAlreadyInMyLibraryHelp": "Episodes will be compared using season and episode numbers, when available.", "SkipEpisodesAlreadyInMyLibraryHelp": "Episodes will be compared using season and episode numbers, when available.",
"LabelKeepUpTo": "Keep up to:", "LabelKeepUpTo": "Keep up to:",
"AsManyAsPossible": "As many as possible", "AsManyAsPossible": "As many as possible",

View file

@ -236,7 +236,7 @@
"PackageInstallCompleted": "Instala\u00e7\u00e3o de {0} conclu\u00edda.", "PackageInstallCompleted": "Instala\u00e7\u00e3o de {0} conclu\u00edda.",
"PackageInstallFailed": "Instala\u00e7\u00e3o de {0} falhou.", "PackageInstallFailed": "Instala\u00e7\u00e3o de {0} falhou.",
"PackageInstallCancelled": "Instala\u00e7\u00e3o de {0} cancelada.", "PackageInstallCancelled": "Instala\u00e7\u00e3o de {0} cancelada.",
"SeriesYearToPresent": "{0}-Presente", "SeriesYearToPresent": "{0} - Presente",
"ValueOneSong": "1 m\u00fasica", "ValueOneSong": "1 m\u00fasica",
"ValueSongCount": "{0} m\u00fasicas", "ValueSongCount": "{0} m\u00fasicas",
"ValueOneMovie": "1 filme", "ValueOneMovie": "1 filme",

View file

@ -1,5 +1,5 @@
{ {
"MessageUnlockAppWithPurchaseOrSupporter": "\u0420\u0430\u0437\u0431\u043b\u043e\u043a\u0438\u0440\u0443\u0439\u0442\u0435 \u0434\u0430\u043d\u043d\u044b\u0439 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442 \u043f\u043e\u0441\u0440\u0435\u0434\u0441\u0442\u0432\u043e\u043c \u043d\u0435\u0431\u043e\u043b\u044c\u0448\u043e\u0439 \u043e\u0434\u043d\u043e\u0440\u0430\u0437\u043e\u0432\u043e\u0439 \u043e\u043f\u043b\u0430\u0442\u044b, \u0438\u043b\u0438 \u0441 \u0434\u0435\u0439\u0441\u0442\u0432\u0443\u044e\u0449\u0435\u0439 \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u043e\u0439 Emby Premiere .", "MessageUnlockAppWithPurchaseOrSupporter": "\u0420\u0430\u0437\u0431\u043b\u043e\u043a\u0438\u0440\u0443\u0439\u0442\u0435 \u0434\u0430\u043d\u043d\u044b\u0439 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442 \u043f\u043e\u0441\u0440\u0435\u0434\u0441\u0442\u0432\u043e\u043c \u043d\u0435\u0431\u043e\u043b\u044c\u0448\u043e\u0439 \u043e\u0434\u043d\u043e\u043a\u0440\u0430\u0442\u043d\u043e\u0439 \u043e\u043f\u043b\u0430\u0442\u044b, \u0438\u043b\u0438 \u0441 \u0434\u0435\u0439\u0441\u0442\u0432\u0443\u044e\u0449\u0435\u0439 \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u043e\u0439 Emby Premiere .",
"MessageUnlockAppWithSupporter": "\u0420\u0430\u0437\u0431\u043b\u043e\u043a\u0438\u0440\u0443\u0439\u0442\u0435 \u0434\u0430\u043d\u043d\u044b\u0439 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442 \u0441 \u0434\u0435\u0439\u0441\u0442\u0432\u0443\u044e\u0449\u0435\u0439 \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u043e\u0439 Emby Premiere.", "MessageUnlockAppWithSupporter": "\u0420\u0430\u0437\u0431\u043b\u043e\u043a\u0438\u0440\u0443\u0439\u0442\u0435 \u0434\u0430\u043d\u043d\u044b\u0439 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442 \u0441 \u0434\u0435\u0439\u0441\u0442\u0432\u0443\u044e\u0449\u0435\u0439 \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u043e\u0439 Emby Premiere.",
"MessageToValidateSupporter": "\u0415\u0441\u043b\u0438 \u0443 \u0432\u0430\u0441 \u0438\u043c\u0435\u0435\u0442\u0441\u044f \u0434\u0435\u0439\u0441\u0442\u0432\u0443\u044e\u0449\u0430\u044f \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0430 Emby Premiere, \u0443\u0431\u0435\u0434\u0438\u0442\u0435\u0441\u044c, \u0447\u0442\u043e Emby Premiere \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0430 \u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043d\u0430 \u0432 \u0432\u0430\u0448\u0435\u0439 \u041f\u0430\u043d\u0435\u043b\u0438 Emby Server, \u043a\u043e\u0442\u043e\u0440\u0430\u044f \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u0430 \u043f\u043e \u0449\u0435\u043b\u0447\u043a\u0443 \u043f\u043e Emby Premiere \u0432 \u0433\u043b\u0430\u0432\u043d\u043e\u043c \u043c\u0435\u043d\u044e.", "MessageToValidateSupporter": "\u0415\u0441\u043b\u0438 \u0443 \u0432\u0430\u0441 \u0438\u043c\u0435\u0435\u0442\u0441\u044f \u0434\u0435\u0439\u0441\u0442\u0432\u0443\u044e\u0449\u0430\u044f \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0430 Emby Premiere, \u0443\u0431\u0435\u0434\u0438\u0442\u0435\u0441\u044c, \u0447\u0442\u043e Emby Premiere \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0430 \u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043d\u0430 \u0432 \u0432\u0430\u0448\u0435\u0439 \u041f\u0430\u043d\u0435\u043b\u0438 Emby Server, \u043a\u043e\u0442\u043e\u0440\u0430\u044f \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u0430 \u043f\u043e \u0449\u0435\u043b\u0447\u043a\u0443 \u043f\u043e Emby Premiere \u0432 \u0433\u043b\u0430\u0432\u043d\u043e\u043c \u043c\u0435\u043d\u044e.",
"ValueSpecialEpisodeName": "\u0421\u043f\u0435\u0446\u044d\u043f\u0438\u0437\u043e\u0434 - {0}", "ValueSpecialEpisodeName": "\u0421\u043f\u0435\u0446\u044d\u043f\u0438\u0437\u043e\u0434 - {0}",
@ -53,7 +53,7 @@
"HeaderFreeApps": "\u0411\u0435\u0441\u043f\u043b\u0430\u0442\u043d\u044b\u0435 Emby-\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f", "HeaderFreeApps": "\u0411\u0435\u0441\u043f\u043b\u0430\u0442\u043d\u044b\u0435 Emby-\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f",
"FreeAppsFeatureDescription": "\u0412\u043e\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435\u0441\u044c \u0431\u0435\u0441\u043f\u043b\u0430\u0442\u043d\u044b\u043c \u0434\u043e\u0441\u0442\u0443\u043f\u043e\u043c \u043a Emby-\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f\u043c \u0434\u043b\u044f \u0432\u0430\u0448\u0438\u0445 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432.", "FreeAppsFeatureDescription": "\u0412\u043e\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435\u0441\u044c \u0431\u0435\u0441\u043f\u043b\u0430\u0442\u043d\u044b\u043c \u0434\u043e\u0441\u0442\u0443\u043f\u043e\u043c \u043a Emby-\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f\u043c \u0434\u043b\u044f \u0432\u0430\u0448\u0438\u0445 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432.",
"HeaderBecomeProjectSupporter": "\u041f\u0440\u0438\u043e\u0431\u0440\u0435\u0441\u0442\u0438 Emby Premiere", "HeaderBecomeProjectSupporter": "\u041f\u0440\u0438\u043e\u0431\u0440\u0435\u0441\u0442\u0438 Emby Premiere",
"MessageActiveSubscriptionRequiredSeriesRecordings": "\u0414\u0435\u0439\u0441\u0442\u0432\u0443\u044e\u0449\u0430\u044f \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0430 Emby Premiere \u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0434\u043b\u044f \u0442\u043e\u0433\u043e, \u0447\u0442\u043e\u0431\u044b \u0441\u043e\u0437\u0434\u0430\u0432\u0430\u0442\u044c \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0437\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0435 \u0437\u0430\u043f\u0438\u0441\u0438 \u0441\u0435\u0440\u0438\u0430\u043b\u043e\u0432.", "MessageActiveSubscriptionRequiredSeriesRecordings": "\u0414\u0435\u0439\u0441\u0442\u0432\u0443\u044e\u0449\u0430\u044f \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0430 Emby Premiere \u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0434\u043b\u044f \u0442\u043e\u0433\u043e, \u0447\u0442\u043e\u0431\u044b \u0441\u043e\u0437\u0434\u0430\u0432\u0430\u0442\u044c \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0437\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0435 \u0441\u0435\u0440\u0438\u0439\u043d\u044b\u0435 \u0437\u0430\u043f\u0438\u0441\u0438.",
"LabelEmailAddress": "\u0410\u0434\u0440\u0435\u0441 \u042d-\u043f\u043e\u0447\u0442\u044b:", "LabelEmailAddress": "\u0410\u0434\u0440\u0435\u0441 \u042d-\u043f\u043e\u0447\u0442\u044b:",
"PromoConvertRecordingsToStreamingFormat": "\u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u043e\u0435 \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u043d\u0438\u0435 \u0437\u0430\u043f\u0438\u0441\u0435\u0439 \u0432 \u0443\u0434\u043e\u0431\u043d\u044b\u0439 \u0434\u043b\u044f \u0442\u0440\u0430\u043d\u0441\u043b\u044f\u0446\u0438\u0438 \u0444\u043e\u0440\u043c\u0430\u0442 \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e Emby Premiere. \u0417\u0430\u043f\u0438\u0441\u0438 \u0431\u0443\u0434\u0443\u0442 \u0434\u0438\u043d\u0430\u043c\u0438\u0447\u0435\u0441\u043a\u0438 \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u044b\u0432\u0430\u0442\u044c\u0441\u044f \u0432 MP4 \u0438\u043b\u0438 MKV, \u043d\u0430 \u043e\u0441\u043d\u043e\u0432\u0435 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043e\u0432 Emby Server.", "PromoConvertRecordingsToStreamingFormat": "\u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u043e\u0435 \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u043d\u0438\u0435 \u0437\u0430\u043f\u0438\u0441\u0435\u0439 \u0432 \u0443\u0434\u043e\u0431\u043d\u044b\u0439 \u0434\u043b\u044f \u0442\u0440\u0430\u043d\u0441\u043b\u044f\u0446\u0438\u0438 \u0444\u043e\u0440\u043c\u0430\u0442 \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e Emby Premiere. \u0417\u0430\u043f\u0438\u0441\u0438 \u0431\u0443\u0434\u0443\u0442 \u0434\u0438\u043d\u0430\u043c\u0438\u0447\u0435\u0441\u043a\u0438 \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u044b\u0432\u0430\u0442\u044c\u0441\u044f \u0432 MP4 \u0438\u043b\u0438 MKV, \u043d\u0430 \u043e\u0441\u043d\u043e\u0432\u0435 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043e\u0432 Emby Server.",
"FeatureRequiresEmbyPremiere": "\u0414\u043b\u044f \u0434\u0430\u043d\u043d\u043e\u0439 \u0444\u0443\u043d\u043a\u0446\u0438\u0438 \u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0434\u0435\u0439\u0441\u0442\u0432\u0443\u044e\u0449\u0430\u044f \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0430 Emby Premiere.", "FeatureRequiresEmbyPremiere": "\u0414\u043b\u044f \u0434\u0430\u043d\u043d\u043e\u0439 \u0444\u0443\u043d\u043a\u0446\u0438\u0438 \u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0434\u0435\u0439\u0441\u0442\u0432\u0443\u044e\u0449\u0430\u044f \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0430 Emby Premiere.",
@ -146,7 +146,7 @@
"LabelSortTitle": "\u0421\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u043a\u0430 \u043f\u043e \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u044e:", "LabelSortTitle": "\u0421\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u043a\u0430 \u043f\u043e \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u044e:",
"LabelDateAdded": "\u0414\u0430\u0442\u0430 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f:", "LabelDateAdded": "\u0414\u0430\u0442\u0430 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f:",
"ConfigureDateAdded": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0434\u0430\u0442\u044b \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u044f\u0435\u0442\u0441\u044f \u0432 \u041f\u0430\u043d\u0435\u043b\u0438 Emby Server \u0432 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0430\u0445 \u041c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0438", "ConfigureDateAdded": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0434\u0430\u0442\u044b \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u044f\u0435\u0442\u0441\u044f \u0432 \u041f\u0430\u043d\u0435\u043b\u0438 Emby Server \u0432 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0430\u0445 \u041c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0438",
"LabelStatus": "\u0421\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0435:", "LabelStatus": "\u0421\u0442\u0430\u0442\u0443\u0441:",
"LabelArtists": "\u0418\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u0438:", "LabelArtists": "\u0418\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u0438:",
"LabelArtistsHelp": "\u0414\u043b\u044f \u0440\u0430\u0437\u0434\u0435\u043b\u0435\u043d\u0438\u044f \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u00ab;\u00bb", "LabelArtistsHelp": "\u0414\u043b\u044f \u0440\u0430\u0437\u0434\u0435\u043b\u0435\u043d\u0438\u044f \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u00ab;\u00bb",
"LabelAlbumArtists": "\u0418\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u0438 \u0430\u043b\u044c\u0431\u043e\u043c\u0430:", "LabelAlbumArtists": "\u0418\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u0438 \u0430\u043b\u044c\u0431\u043e\u043c\u0430:",
@ -256,7 +256,7 @@
"PleaseEnterNameOrId": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u0438\u043b\u0438 \u0432\u043d\u0435\u0448\u043d\u0438\u0439 ID.", "PleaseEnterNameOrId": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u0438\u043b\u0438 \u0432\u043d\u0435\u0448\u043d\u0438\u0439 ID.",
"MessageItemSaved": "\u042d\u043b\u0435\u043c\u0435\u043d\u0442 \u0441\u043e\u0445\u0440\u0430\u043d\u0451\u043d.", "MessageItemSaved": "\u042d\u043b\u0435\u043c\u0435\u043d\u0442 \u0441\u043e\u0445\u0440\u0430\u043d\u0451\u043d.",
"SearchResults": "\u0420\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u044b \u043f\u043e\u0438\u0441\u043a\u0430", "SearchResults": "\u0420\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u044b \u043f\u043e\u0438\u0441\u043a\u0430",
"SyncToOtherDevice": "\u0421\u0438\u043d\u0445\u0440\u043e \u0441 \u0434\u0440\u0443\u0433\u0438\u043c \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e\u043c", "SyncToOtherDevice": "\u0421\u0438\u043d\u0445\u0440\u043e \u0441 \u0434\u0440. \u0443\u0441\u0442\u0440-\u043e\u043c",
"MakeAvailableOffline": "\u0421\u0434\u0435\u043b\u0430\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u043c \u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u043e", "MakeAvailableOffline": "\u0421\u0434\u0435\u043b\u0430\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u043c \u0430\u0432\u0442\u043e\u043d\u043e\u043c\u043d\u043e",
"ServerNameIsRestarting": "Emby Server - {0} \u043f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u043a\u0430\u0435\u0442\u0441\u044f.", "ServerNameIsRestarting": "Emby Server - {0} \u043f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u043a\u0430\u0435\u0442\u0441\u044f.",
"ServerNameIsShuttingDown": "Emby Server - {0} \u0437\u0430\u0432\u0435\u0440\u0448\u0430\u0435\u0442 \u0440\u0430\u0431\u043e\u0442\u0443.", "ServerNameIsShuttingDown": "Emby Server - {0} \u0437\u0430\u0432\u0435\u0440\u0448\u0430\u0435\u0442 \u0440\u0430\u0431\u043e\u0442\u0443.",
@ -291,7 +291,7 @@
"LiveBroadcasts": "\u041f\u0440\u044f\u043c\u044b\u0435 \u0442\u0440\u0430\u043d\u0441\u043b\u044f\u0446\u0438\u0438", "LiveBroadcasts": "\u041f\u0440\u044f\u043c\u044b\u0435 \u0442\u0440\u0430\u043d\u0441\u043b\u044f\u0446\u0438\u0438",
"Premieres": "\u041f\u0440\u0435\u043c\u044c\u0435\u0440\u044b", "Premieres": "\u041f\u0440\u0435\u043c\u044c\u0435\u0440\u044b",
"RepeatEpisodes": "\u041f\u043e\u0432\u0442\u043e\u0440 \u044d\u043f\u0438\u0437\u043e\u0434\u043e\u0432", "RepeatEpisodes": "\u041f\u043e\u0432\u0442\u043e\u0440 \u044d\u043f\u0438\u0437\u043e\u0434\u043e\u0432",
"DvrSubscriptionRequired": "\u0414\u043b\u044f Emby DVR \u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0434\u0435\u0439\u0441\u0442\u0432\u0443\u044e\u0449\u0430\u044f \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0430 Emby Premiere.", "DvrSubscriptionRequired": "\u0414\u043b\u044f \u0432\u0438\u0434\u0435\u043e\u0440\u0435\u043a\u043e\u0440\u0434\u0435\u0440\u0430 Emby \u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0434\u0435\u0439\u0441\u0442\u0432\u0443\u044e\u0449\u0430\u044f \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0430 Emby Premiere.",
"HeaderCancelRecording": "\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c \u0437\u0430\u043f\u0438\u0441\u044c", "HeaderCancelRecording": "\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c \u0437\u0430\u043f\u0438\u0441\u044c",
"CancelRecording": "\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c \u0437\u0430\u043f\u0438\u0441\u044c", "CancelRecording": "\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c \u0437\u0430\u043f\u0438\u0441\u044c",
"HeaderKeepRecording": "\u041f\u0440\u043e\u0434\u043e\u043b\u0436\u0435\u043d\u0438\u0435 \u0437\u0430\u043f\u0438\u0441\u0438", "HeaderKeepRecording": "\u041f\u0440\u043e\u0434\u043e\u043b\u0436\u0435\u043d\u0438\u0435 \u0437\u0430\u043f\u0438\u0441\u0438",

View file

@ -1,9 +1,6 @@
{ {
"name": "fetch", "name": "fetch",
"main": "fetch.js", "main": "fetch.js",
"devDependencies": {
"es6-promise": "1.0.0"
},
"ignore": [ "ignore": [
".*", ".*",
"*.md", "*.md",
@ -14,15 +11,14 @@
"test/" "test/"
], ],
"homepage": "https://github.com/github/fetch", "homepage": "https://github.com/github/fetch",
"version": "1.0.0", "version": "1.1.0",
"_release": "1.0.0", "_release": "1.1.0",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.0", "tag": "v1.1.0",
"commit": "f054e7b5ce2bf7f86c8d7212c2de026800725b84" "commit": "76f6a09cbfc1c955479dd9da2a333f7404c79de2"
}, },
"_source": "https://github.com/github/fetch.git", "_source": "https://github.com/github/fetch.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "fetch", "_originalSource": "fetch"
"_direct": true
} }

View file

@ -1,9 +1,6 @@
{ {
"name": "fetch", "name": "fetch",
"main": "fetch.js", "main": "fetch.js",
"devDependencies": {
"es6-promise": "1.0.0"
},
"ignore": [ "ignore": [
".*", ".*",
"*.md", "*.md",

View file

@ -20,6 +20,28 @@
arrayBuffer: 'ArrayBuffer' in self arrayBuffer: 'ArrayBuffer' in self
} }
if (support.arrayBuffer) {
var viewClasses = [
'[object Int8Array]',
'[object Uint8Array]',
'[object Uint8ClampedArray]',
'[object Int16Array]',
'[object Uint16Array]',
'[object Int32Array]',
'[object Uint32Array]',
'[object Float32Array]',
'[object Float64Array]'
]
var isDataView = function(obj) {
return obj && DataView.prototype.isPrototypeOf(obj)
}
var isArrayBufferView = ArrayBuffer.isView || function(obj) {
return obj && viewClasses.indexOf(Object.prototype.toString.call(obj)) > -1
}
}
function normalizeName(name) { function normalizeName(name) {
if (typeof name !== 'string') { if (typeof name !== 'string') {
name = String(name) name = String(name)
@ -152,14 +174,26 @@
function readBlobAsArrayBuffer(blob) { function readBlobAsArrayBuffer(blob) {
var reader = new FileReader() var reader = new FileReader()
var promise = fileReaderReady(reader)
reader.readAsArrayBuffer(blob) reader.readAsArrayBuffer(blob)
return fileReaderReady(reader) return promise
} }
function readBlobAsText(blob) { function readBlobAsText(blob) {
var reader = new FileReader() var reader = new FileReader()
var promise = fileReaderReady(reader)
reader.readAsText(blob) reader.readAsText(blob)
return fileReaderReady(reader) return promise
}
function bufferClone(buf) {
if (buf.slice) {
return buf.slice(0)
} else {
var view = new Uint8Array(buf.byteLength)
view.set(new Uint8Array(buf))
return view.buffer
}
} }
function Body() { function Body() {
@ -167,7 +201,9 @@
this._initBody = function(body) { this._initBody = function(body) {
this._bodyInit = body this._bodyInit = body
if (typeof body === 'string') { if (!body) {
this._bodyText = ''
} else if (typeof body === 'string') {
this._bodyText = body this._bodyText = body
} else if (support.blob && Blob.prototype.isPrototypeOf(body)) { } else if (support.blob && Blob.prototype.isPrototypeOf(body)) {
this._bodyBlob = body this._bodyBlob = body
@ -175,11 +211,12 @@
this._bodyFormData = body this._bodyFormData = body
} else if (support.searchParams && URLSearchParams.prototype.isPrototypeOf(body)) { } else if (support.searchParams && URLSearchParams.prototype.isPrototypeOf(body)) {
this._bodyText = body.toString() this._bodyText = body.toString()
} else if (!body) { } else if (support.arrayBuffer && support.blob && isDataView(body)) {
this._bodyText = '' this._bodyArrayBuffer = bufferClone(body.buffer)
} else if (support.arrayBuffer && ArrayBuffer.prototype.isPrototypeOf(body)) { // IE 10-11 can't handle a DataView body.
// Only support ArrayBuffers for POST method. this._bodyInit = new Blob([this._bodyArrayBuffer])
// Receiving ArrayBuffers happens via Blobs, instead. } else if (support.arrayBuffer && (ArrayBuffer.prototype.isPrototypeOf(body) || isArrayBufferView(body))) {
this._bodyArrayBuffer = bufferClone(body)
} else { } else {
throw new Error('unsupported BodyInit type') throw new Error('unsupported BodyInit type')
} }
@ -204,36 +241,43 @@
if (this._bodyBlob) { if (this._bodyBlob) {
return Promise.resolve(this._bodyBlob) return Promise.resolve(this._bodyBlob)
} else if (this._bodyArrayBuffer) {
return Promise.resolve(new Blob([this._bodyArrayBuffer]))
} else if (this._bodyFormData) { } else if (this._bodyFormData) {
throw new Error('could not read FormData body as blob') throw new Error('could not read FormData body as blob')
} else { } else {
return Promise.resolve(new Blob([this._bodyText])) return Promise.resolve(new Blob([this._bodyText]))
} }
} }
}
this.text = function() {
var rejected = consumed(this)
if (rejected) {
return rejected
}
if (this._bodyBlob) {
return readBlobAsText(this._bodyBlob)
} else if (this._bodyArrayBuffer) {
var view = new Uint8Array(this._bodyArrayBuffer)
var str = String.fromCharCode.apply(null, view)
return Promise.resolve(str)
} else if (this._bodyFormData) {
throw new Error('could not read FormData body as text')
} else {
return Promise.resolve(this._bodyText)
}
}
if (support.arrayBuffer) {
this.arrayBuffer = function() { this.arrayBuffer = function() {
return this.blob().then(readBlobAsArrayBuffer) if (this._bodyArrayBuffer) {
} return consumed(this) || Promise.resolve(this._bodyArrayBuffer)
this.text = function() {
var rejected = consumed(this)
if (rejected) {
return rejected
}
if (this._bodyBlob) {
return readBlobAsText(this._bodyBlob)
} else if (this._bodyFormData) {
throw new Error('could not read FormData body as text')
} else { } else {
return Promise.resolve(this._bodyText) return this.blob().then(readBlobAsArrayBuffer)
} }
} }
} else {
this.text = function() {
var rejected = consumed(this)
return rejected ? rejected : Promise.resolve(this._bodyText)
}
} }
if (support.formData) { if (support.formData) {
@ -260,7 +304,10 @@
function Request(input, options) { function Request(input, options) {
options = options || {} options = options || {}
var body = options.body var body = options.body
if (Request.prototype.isPrototypeOf(input)) {
if (typeof input === 'string') {
this.url = input
} else {
if (input.bodyUsed) { if (input.bodyUsed) {
throw new TypeError('Already read') throw new TypeError('Already read')
} }
@ -271,12 +318,10 @@
} }
this.method = input.method this.method = input.method
this.mode = input.mode this.mode = input.mode
if (!body) { if (!body && input._bodyInit != null) {
body = input._bodyInit body = input._bodyInit
input.bodyUsed = true input.bodyUsed = true
} }
} else {
this.url = input
} }
this.credentials = options.credentials || this.credentials || 'omit' this.credentials = options.credentials || this.credentials || 'omit'
@ -294,7 +339,7 @@
} }
Request.prototype.clone = function() { Request.prototype.clone = function() {
return new Request(this) return new Request(this, { body: this._bodyInit })
} }
function decode(body) { function decode(body) {
@ -310,16 +355,17 @@
return form return form
} }
function headers(xhr) { function parseHeaders(rawHeaders) {
var head = new Headers() var headers = new Headers()
var pairs = (xhr.getAllResponseHeaders() || '').trim().split('\n') rawHeaders.split('\r\n').forEach(function(line) {
pairs.forEach(function(header) { var parts = line.split(':')
var split = header.trim().split(':') var key = parts.shift().trim()
var key = split.shift().trim() if (key) {
var value = split.join(':').trim() var value = parts.join(':').trim()
head.append(key, value) headers.append(key, value)
}
}) })
return head return headers
} }
Body.call(Request.prototype) Body.call(Request.prototype)
@ -330,10 +376,10 @@
} }
this.type = 'default' this.type = 'default'
this.status = options.status this.status = 'status' in options ? options.status : 200
this.ok = this.status >= 200 && this.status < 300 this.ok = this.status >= 200 && this.status < 300
this.statusText = options.statusText this.statusText = 'statusText' in options ? options.statusText : 'OK'
this.headers = options.headers instanceof Headers ? options.headers : new Headers(options.headers) this.headers = new Headers(options.headers)
this.url = options.url || '' this.url = options.url || ''
this._initBody(bodyInit) this._initBody(bodyInit)
} }
@ -371,35 +417,16 @@
self.fetch = function(input, init) { self.fetch = function(input, init) {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
var request var request = new Request(input, init)
if (Request.prototype.isPrototypeOf(input) && !init) {
request = input
} else {
request = new Request(input, init)
}
var xhr = new XMLHttpRequest() var xhr = new XMLHttpRequest()
function responseURL() {
if ('responseURL' in xhr) {
return xhr.responseURL
}
// Avoid security warnings on getResponseHeader when not allowed by CORS
if (/^X-Request-URL:/m.test(xhr.getAllResponseHeaders())) {
return xhr.getResponseHeader('X-Request-URL')
}
return
}
xhr.onload = function() { xhr.onload = function() {
var options = { var options = {
status: xhr.status, status: xhr.status,
statusText: xhr.statusText, statusText: xhr.statusText,
headers: headers(xhr), headers: parseHeaders(xhr.getAllResponseHeaders() || '')
url: responseURL()
} }
options.url = 'responseURL' in xhr ? xhr.responseURL : options.headers.get('X-Request-URL')
var body = 'response' in xhr ? xhr.response : xhr.responseText var body = 'response' in xhr ? xhr.response : xhr.responseText
resolve(new Response(body, options)) resolve(new Response(body, options))
} }

View file

@ -97,7 +97,7 @@
if (options.disableEdgeSwipe) { if (options.disableEdgeSwipe) {
return; return;
} }
return;
require(['hammer-main'], initEdgeSwipeInternal); require(['hammer-main'], initEdgeSwipeInternal);
} }

View file

@ -1,4 +1,4 @@
<div id="itemListPage" data-role="page" class="page libraryPage folderListPage noSecondaryNavPage"> <div id="itemListPage" data-role="page" class="page libraryPage folderListPage noSecondaryNavPage" data-backbutton="true">
<div class="alphaPicker alphaPicker-vertical alphabetPicker"> <div class="alphaPicker alphaPicker-vertical alphabetPicker">
</div> </div>
<div data-role="content" class="itemListContent"> <div data-role="content" class="itemListContent">

View file

@ -105,10 +105,10 @@
</div> </div>
</div> </div>
<div class="pageTabContent ehsContent" id="genresTab" data-index="4"> <div class="pageTabContent ehsContent" id="genresTab" data-index="4">
<div style="text-align: center; display: flex; align-items: center; justify-content: center;"> <div style="text-align: center; display: flex; flex-wrap: wrap; align-items: center; justify-content: center;padding:0 .5em;">
<button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><i class="md-icon">view_comfy</i></button> <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><i class="md-icon">view_comfy</i></button>
</div> </div>
<div is="emby-itemscontainer" id="items" class="itemsContainer paddedItemsContainer vertical-wrap"></div> <div id="items"></div>
</div> </div>
<div class="pageTabContent ehsContent" id="studiosTab" data-index="5"> <div class="pageTabContent ehsContent" id="studiosTab" data-index="5">
<div class="viewSettings"> <div class="viewSettings">

View file

@ -1,4 +1,4 @@
<div id="photosPage" data-role="page" data-dom-cache="true" class="page libraryPage noSecondaryNavPage" data-require="scripts/photos"> <div id="photosPage" data-role="page" data-dom-cache="true" class="page libraryPage noSecondaryNavPage" data-require="scripts/photos" data-backbutton="true">
<div data-role="content"> <div data-role="content">
<div class="viewSettings"> <div class="viewSettings">

View file

@ -1,4 +1,4 @@
define(['libraryBrowser', 'cardBuilder'], function (libraryBrowser, cardBuilder) { define(['libraryBrowser', 'cardBuilder', 'lazyLoader', 'apphost'], function (libraryBrowser, cardBuilder, lazyLoader, appHost) {
'use strict'; 'use strict';
return function (view, params, tabContent) { return function (view, params, tabContent) {
@ -17,10 +17,9 @@
SortOrder: "Ascending", SortOrder: "Ascending",
IncludeItemTypes: "Movie", IncludeItemTypes: "Movie",
Recursive: true, Recursive: true,
Fields: "DateCreated,ItemCounts,PrimaryImageAspectRatio", EnableTotalRecordCount: false
StartIndex: 0
}, },
view: libraryBrowser.getSavedView(key) || 'Thumb' view: libraryBrowser.getSavedView(key) || 'PosterCard'
}; };
pageData.query.ParentId = params.topParentId; pageData.query.ParentId = params.topParentId;
@ -36,7 +35,7 @@
function getSavedQueryKey() { function getSavedQueryKey() {
return libraryBrowser.getSavedQueryKey('genres'); return libraryBrowser.getSavedQueryKey('moviegenres');
} }
function getPromise() { function getPromise() {
@ -47,65 +46,136 @@
return ApiClient.getGenres(Dashboard.getCurrentUserId(), query); return ApiClient.getGenres(Dashboard.getCurrentUserId(), query);
} }
function reloadItems(context, promise) { function enableScrollX() {
return browserInfo.mobile && AppInfo.enableAppLayouts;
}
var query = getQuery(); function getThumbShape() {
return enableScrollX() ? 'overflowBackdrop' : 'backdrop';
}
promise.then(function (result) { function getPortraitShape() {
return enableScrollX() ? 'overflowPortrait' : 'portrait';
}
var html = ''; function fillItemsContainer(elem) {
var viewStyle = self.getCurrentViewStyle(); var id = elem.getAttribute('data-id');
var elem = context.querySelector('#items');
var viewStyle = self.getCurrentViewStyle();
var limit = viewStyle == 'Thumb' || viewStyle == 'ThumbCard' ?
5 :
8;
var enableImageTypes = viewStyle == 'Thumb' || viewStyle == 'ThumbCard' ?
"Primary,Backdrop,Thumb" :
"Primary";
var query = {
SortBy: "SortName",
SortOrder: "Ascending",
IncludeItemTypes: "Movie",
Recursive: true,
Fields: "PrimaryImageAspectRatio,MediaSourceCount,BasicSyncInfo",
ImageTypeLimit: 1,
EnableImageTypes: enableImageTypes,
Limit: limit,
GenreIds: id,
EnableTotalRecordCount: false
};
ApiClient.getItems(Dashboard.getCurrentUserId(), query).then(function (result) {
var supportsImageAnalysis = appHost.supports('imageanalysis');
if (viewStyle == "Thumb") { if (viewStyle == "Thumb") {
cardBuilder.buildCards(result.Items, { cardBuilder.buildCards(result.Items, {
itemsContainer: elem, itemsContainer: elem,
shape: "backdrop", shape: getThumbShape(),
preferThumb: true, preferThumb: true,
showTitle: true, showTitle: true,
scalable: true, scalable: true,
showItemCounts: true,
centerText: true, centerText: true,
overlayMoreButton: true overlayMoreButton: true,
allowBottomPadding: false
}); });
} }
else if (viewStyle == "ThumbCard") { else if (viewStyle == "ThumbCard") {
cardBuilder.buildCards(result.Items, { cardBuilder.buildCards(result.Items, {
itemsContainer: elem, itemsContainer: elem,
shape: "backdrop", shape: getThumbShape(),
preferThumb: true, preferThumb: true,
showTitle: true, showTitle: true,
scalable: true, scalable: true,
showItemCounts: true,
centerText: false, centerText: false,
cardLayout: true cardLayout: true,
vibrant: supportsImageAnalysis,
showYear: true
}); });
} }
else if (viewStyle == "PosterCard") { else if (viewStyle == "PosterCard") {
cardBuilder.buildCards(result.Items, { cardBuilder.buildCards(result.Items, {
itemsContainer: elem, itemsContainer: elem,
shape: "auto", shape: getPortraitShape(),
showTitle: true, showTitle: true,
scalable: true, scalable: true,
showItemCounts: true,
centerText: false, centerText: false,
cardLayout: true cardLayout: true,
vibrant: supportsImageAnalysis,
showYear: true
}); });
} }
else if (viewStyle == "Poster") { else if (viewStyle == "Poster") {
cardBuilder.buildCards(result.Items, { cardBuilder.buildCards(result.Items, {
itemsContainer: elem, itemsContainer: elem,
shape: "auto", shape: getPortraitShape(),
showTitle: true, showTitle: true,
scalable: true, scalable: true,
showItemCounts: true,
centerText: true, centerText: true,
overlayMoreButton: true overlayMoreButton: true,
allowBottomPadding: false
}); });
} }
});
}
function reloadItems(context, promise) {
var query = getQuery();
promise.then(function (result) {
var elem = context.querySelector('#items');
var html = '';
var items = result.Items;
for (var i = 0, length = items.length; i < length; i++) {
var item = items[i];
html += '<div class="homePageSection">';
html += '<h1 class="listHeader">';
html += item.Name;
html += '</h1>';
if (enableScrollX()) {
html += '<div is="emby-itemscontainer" class="itemsContainer hiddenScrollX lazy" data-id="' + item.Id + '">';
} else {
html += '<div is="emby-itemscontainer" class="itemsContainer vertical-wrap lazy" data-id="' + item.Id + '">';
}
html += '</div>';
html += '</div>';
}
elem.innerHTML = html;
lazyLoader.lazyChildren(elem, fillItemsContainer);
libraryBrowser.saveQueryValues(getSavedQueryKey(), query); libraryBrowser.saveQueryValues(getSavedQueryKey(), query);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();

View file

@ -299,7 +299,7 @@
showUnplayedIndicator: false, showUnplayedIndicator: false,
showChildCountIndicator: true, showChildCountIndicator: true,
context: 'home', context: 'home',
overlayText: !cardLayout, overlayText: false,
centerText: !cardLayout, centerText: !cardLayout,
overlayPlayButton: viewType !== 'photos', overlayPlayButton: viewType !== 'photos',
allowBottomPadding: !enableScrollX() && !cardLayout, allowBottomPadding: !enableScrollX() && !cardLayout,

View file

@ -1222,6 +1222,7 @@ var AppInfo = {};
define("libjass", [bowerPath + "/libjass/libjass.min", "css!" + bowerPath + "/libjass/libjass"], returnFirstDependency); define("libjass", [bowerPath + "/libjass/libjass.min", "css!" + bowerPath + "/libjass/libjass"], returnFirstDependency);
define("lazyLoader", [embyWebComponentsBowerPath + "/images/lazyloader"], returnFirstDependency);
define("imageLoader", [embyWebComponentsBowerPath + "/images/imagehelper"], returnFirstDependency); define("imageLoader", [embyWebComponentsBowerPath + "/images/imagehelper"], returnFirstDependency);
define("syncJobList", ["components/syncjoblist/syncjoblist"], returnFirstDependency); define("syncJobList", ["components/syncjoblist/syncjoblist"], returnFirstDependency);
define("appfooter", ["components/appfooter/appfooter"], returnFirstDependency); define("appfooter", ["components/appfooter/appfooter"], returnFirstDependency);

View file

@ -1,4 +1,4 @@
define(['libraryBrowser', 'cardBuilder'], function (libraryBrowser, cardBuilder) { define(['libraryBrowser', 'cardBuilder', 'lazyLoader', 'apphost'], function (libraryBrowser, cardBuilder, lazyLoader, appHost) {
'use strict'; 'use strict';
return function (view, params, tabContent) { return function (view, params, tabContent) {
@ -17,10 +17,9 @@
SortOrder: "Ascending", SortOrder: "Ascending",
IncludeItemTypes: "Series", IncludeItemTypes: "Series",
Recursive: true, Recursive: true,
Fields: "DateCreated,ItemCounts,PrimaryImageAspectRatio", EnableTotalRecordCount: false
StartIndex: 0
}, },
view: libraryBrowser.getSavedView(key) || 'Thumb' view: libraryBrowser.getSavedView(key) || 'PosterCard'
}; };
pageData.query.ParentId = params.topParentId; pageData.query.ParentId = params.topParentId;
@ -36,7 +35,7 @@
function getSavedQueryKey() { function getSavedQueryKey() {
return libraryBrowser.getSavedQueryKey('genres'); return libraryBrowser.getSavedQueryKey('seriesgenres');
} }
function getPromise() { function getPromise() {
@ -47,65 +46,136 @@
return ApiClient.getGenres(Dashboard.getCurrentUserId(), query); return ApiClient.getGenres(Dashboard.getCurrentUserId(), query);
} }
function reloadItems(context, promise) { function enableScrollX() {
return browserInfo.mobile && AppInfo.enableAppLayouts;
}
var query = getQuery(); function getThumbShape() {
return enableScrollX() ? 'overflowBackdrop' : 'backdrop';
}
promise.then(function (result) { function getPortraitShape() {
return enableScrollX() ? 'overflowPortrait' : 'portrait';
}
var html = ''; function fillItemsContainer(elem) {
var viewStyle = self.getCurrentViewStyle(); var id = elem.getAttribute('data-id');
var elem = context.querySelector('#items');
var viewStyle = self.getCurrentViewStyle();
var limit = viewStyle == 'Thumb' || viewStyle == 'ThumbCard' ?
5 :
8;
var enableImageTypes = viewStyle == 'Thumb' || viewStyle == 'ThumbCard' ?
"Primary,Backdrop,Thumb" :
"Primary";
var query = {
SortBy: "SortName",
SortOrder: "Ascending",
IncludeItemTypes: "Series",
Recursive: true,
Fields: "PrimaryImageAspectRatio,MediaSourceCount,BasicSyncInfo",
ImageTypeLimit: 1,
EnableImageTypes: enableImageTypes,
Limit: limit,
GenreIds: id,
EnableTotalRecordCount: false
};
ApiClient.getItems(Dashboard.getCurrentUserId(), query).then(function (result) {
var supportsImageAnalysis = appHost.supports('imageanalysis');
if (viewStyle == "Thumb") { if (viewStyle == "Thumb") {
cardBuilder.buildCards(result.Items, { cardBuilder.buildCards(result.Items, {
itemsContainer: elem, itemsContainer: elem,
shape: "backdrop", shape: getThumbShape(),
preferThumb: true, preferThumb: true,
showTitle: true, showTitle: true,
scalable: true, scalable: true,
showItemCounts: true,
centerText: true, centerText: true,
overlayMoreButton: true overlayMoreButton: true,
allowBottomPadding: false
}); });
} }
else if (viewStyle == "ThumbCard") { else if (viewStyle == "ThumbCard") {
cardBuilder.buildCards(result.Items, { cardBuilder.buildCards(result.Items, {
itemsContainer: elem, itemsContainer: elem,
shape: "backdrop", shape: getThumbShape(),
preferThumb: true, preferThumb: true,
showTitle: true, showTitle: true,
scalable: true, scalable: true,
showItemCounts: true,
centerText: false, centerText: false,
cardLayout: true cardLayout: true,
vibrant: supportsImageAnalysis,
showYear: true
}); });
} }
else if (viewStyle == "PosterCard") { else if (viewStyle == "PosterCard") {
cardBuilder.buildCards(result.Items, { cardBuilder.buildCards(result.Items, {
itemsContainer: elem, itemsContainer: elem,
shape: "auto", shape: getPortraitShape(),
showTitle: true, showTitle: true,
scalable: true, scalable: true,
showItemCounts: true,
centerText: false, centerText: false,
cardLayout: true cardLayout: true,
vibrant: supportsImageAnalysis,
showYear: true
}); });
} }
else if (viewStyle == "Poster") { else if (viewStyle == "Poster") {
cardBuilder.buildCards(result.Items, { cardBuilder.buildCards(result.Items, {
itemsContainer: elem, itemsContainer: elem,
shape: "auto", shape: getPortraitShape(),
showTitle: true, showTitle: true,
scalable: true, scalable: true,
showItemCounts: true,
centerText: true, centerText: true,
overlayMoreButton: true overlayMoreButton: true,
allowBottomPadding: false
}); });
} }
});
}
function reloadItems(context, promise) {
var query = getQuery();
promise.then(function (result) {
var elem = context.querySelector('#items');
var html = '';
var items = result.Items;
for (var i = 0, length = items.length; i < length; i++) {
var item = items[i];
html += '<div class="homePageSection">';
html += '<h1 class="listHeader">';
html += item.Name;
html += '</h1>';
if (enableScrollX()) {
html += '<div is="emby-itemscontainer" class="itemsContainer hiddenScrollX lazy" data-id="' + item.Id + '">';
} else {
html += '<div is="emby-itemscontainer" class="itemsContainer vertical-wrap lazy" data-id="' + item.Id + '">';
}
html += '</div>';
html += '</div>';
}
elem.innerHTML = html;
lazyLoader.lazyChildren(elem, fillItemsContainer);
libraryBrowser.saveQueryValues(getSavedQueryKey(), query); libraryBrowser.saveQueryValues(getSavedQueryKey(), query);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();

View file

@ -159,14 +159,14 @@
depends.push('scripts/tvshows'); depends.push('scripts/tvshows');
break; break;
case 4: case 4:
depends.push('scripts/episodes');
break;
case 5:
depends.push('scripts/tvgenres'); depends.push('scripts/tvgenres');
break; break;
case 6: case 5:
depends.push('scripts/tvstudios'); depends.push('scripts/tvstudios');
break; break;
case 6:
depends.push('scripts/episodes');
break;
default: default:
break; break;
} }

View file

@ -1,4 +1,4 @@
define(['events', 'libraryBrowser', 'imageLoader', 'alphaPicker', 'listView', 'cardBuilder', 'apphost', 'emby-itemscontainer'], function (events, libraryBrowser, imageLoader, alphaPicker, listView, cardBuilder, appHost) { define(['events', 'libraryBrowser', 'imageLoader', 'listView', 'cardBuilder', 'apphost', 'emby-itemscontainer'], function (events, libraryBrowser, imageLoader, listView, cardBuilder, appHost) {
'use strict'; 'use strict';
return function (view, params, tabContent) { return function (view, params, tabContent) {
@ -220,26 +220,10 @@
function updateFilterControls(tabContent) { function updateFilterControls(tabContent) {
var query = getQuery(tabContent);
self.alphaPicker.value(query.NameStartsWithOrGreater);
} }
function initPage(tabContent) { function initPage(tabContent) {
var alphaPickerElement = tabContent.querySelector('.alphaPicker');
alphaPickerElement.addEventListener('alphavaluechanged', function (e) {
var newValue = e.detail.value;
var query = getQuery(tabContent);
query.NameStartsWithOrGreater = newValue;
query.StartIndex = 0;
reloadItems(tabContent);
});
self.alphaPicker = new alphaPicker({
element: alphaPickerElement,
valueChangeEvent: 'click'
});
tabContent.querySelector('.btnFilter').addEventListener('click', function () { tabContent.querySelector('.btnFilter').addEventListener('click', function () {
self.showFilterMenu(); self.showFilterMenu();
}); });

View file

@ -15,14 +15,14 @@
<div class="emby-button-foreground">${TabShows}</div> <div class="emby-button-foreground">${TabShows}</div>
</button> </button>
<button is="emby-button" class="emby-tab-button" data-index="4"> <button is="emby-button" class="emby-tab-button" data-index="4">
<div class="emby-button-foreground">${TabEpisodes}</div>
</button>
<button is="emby-button" class="emby-tab-button" data-index="5">
<div class="emby-button-foreground">${TabGenres}</div> <div class="emby-button-foreground">${TabGenres}</div>
</button> </button>
<button is="emby-button" class="emby-tab-button" data-index="6"> <button is="emby-button" class="emby-tab-button" data-index="5">
<div class="emby-button-foreground">${TabNetworks}</div> <div class="emby-button-foreground">${TabNetworks}</div>
</button> </button>
<button is="emby-button" class="emby-tab-button" data-index="6">
<div class="emby-button-foreground">${TabEpisodes}</div>
</button>
</div> </div>
</div> </div>
@ -81,16 +81,26 @@
<button is="paper-icon-button-light" class="btnFilter autoSize" title="${ButtonFilter}"><i class="md-icon">filter_list</i></button> <button is="paper-icon-button-light" class="btnFilter autoSize" title="${ButtonFilter}"><i class="md-icon">filter_list</i></button>
</div> </div>
<div class="alphaPicker alphabetPicker alphaPicker-vertical"> <div is="emby-itemscontainer" class="itemsContainer">
</div>
<div is="emby-itemscontainer" class="itemsContainer itemsContainerWithAlphaPicker">
</div> </div>
<div style="text-align: center; display: flex; flex-wrap: wrap; align-items: center; justify-content: center;padding:.7em .5em;"> <div style="text-align: center; display: flex; flex-wrap: wrap; align-items: center; justify-content: center;padding:.7em .5em;">
<div class="paging"></div> <div class="paging"></div>
</div> </div>
</div> </div>
<div class="pageTabContent ehsContent" id="episodesTab" data-index="4"> <div class="pageTabContent ehsContent" id="genresTab" data-index="4">
<div style="text-align: center; display: flex; align-items: center; justify-content: center;">
<button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><i class="md-icon">view_comfy</i></button>
</div>
<div id="items"></div>
</div>
<div class="pageTabContent ehsContent" id="studiosTab" data-index="5">
<div class="viewSettings">
<div class="listTopPaging">
</div>
</div>
<div is="emby-itemscontainer" id="items" class="itemsContainer paddedItemsContainer vertical-wrap" style="text-align: center;"></div>
</div>
<div class="pageTabContent ehsContent" id="episodesTab" data-index="6">
<div style="text-align: center; display: flex; flex-wrap: wrap; align-items: center; justify-content: center;padding:0 .5em 1em;"> <div style="text-align: center; display: flex; flex-wrap: wrap; align-items: center; justify-content: center;padding:0 .5em 1em;">
<div class="paging"></div> <div class="paging"></div>
<button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><i class="md-icon">view_comfy</i></button> <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><i class="md-icon">view_comfy</i></button>
@ -103,19 +113,6 @@
<div class="paging"></div> <div class="paging"></div>
</div> </div>
</div> </div>
<div class="pageTabContent ehsContent" id="genresTab" data-index="5">
<div style="text-align: center; display: flex; align-items: center; justify-content: center;">
<button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><i class="md-icon">view_comfy</i></button>
</div>
<div is="emby-itemscontainer" id="items" class="itemsContainer paddedItemsContainer vertical-wrap"></div>
</div>
<div class="pageTabContent ehsContent" id="studiosTab" data-index="6">
<div class="viewSettings">
<div class="listTopPaging">
</div>
</div>
<div is="emby-itemscontainer" id="items" class="itemsContainer paddedItemsContainer vertical-wrap" style="text-align: center;"></div>
</div>
<div data-role="content"> <div data-role="content">
</div> </div>