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

Merge pull request #297 from jellyfin/release-10.3.z

Backmerge for 10.3.2 release
This commit is contained in:
Joshua M. Boniface 2019-04-30 23:35:40 -04:00 committed by GitHub
commit 12589460cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 33 deletions

View file

@ -0,0 +1,43 @@
define(["datetime", "cardBuilder", "imageLoader", "apphost", "loading", "paper-icon-button-light", "emby-button"], function(datetime, cardBuilder, imageLoader, appHost, loading) {
"use strict";
function renderTimers(context, timers) {
var html = "";
appHost.supports("imageanalysis");
html += cardBuilder.getCardsHtml({
items: timers,
shape: "auto",
defaultShape: "portrait",
showTitle: !0,
cardLayout: !1,
preferThumb: "auto",
coverImage: !0,
overlayText: !1,
showSeriesTimerTime: !0,
showSeriesTimerChannel: !0,
centerText: !0,
overlayMoreButton: !0,
lines: 3
});
var elem = context.querySelector("#items");
elem.innerHTML = html, imageLoader.lazyChildren(elem), loading.hide()
}
function reload(context, promise) {
loading.show(), promise.then(function(result) {
renderTimers(context, result.Items)
})
}
var query = {
SortBy: "SortName",
SortOrder: "Ascending"
};
return function(view, params, tabContent) {
var timersPromise, self = this;
self.preRender = function() {
timersPromise = ApiClient.getLiveTvSeriesTimers(query)
}, self.renderTab = function() {
reload(tabContent, timersPromise)
}
}
});

View file

@ -163,11 +163,6 @@ define([
autoFocus: false,
roles: "admin"
});
defineRoute({
path: "/livetvseriestimer.html",
autoFocus: false,
controller: "livetvseriestimer"
});
defineRoute({
path: "/livetvsettings.html",
autoFocus: false
@ -432,4 +427,4 @@ define([
isDefaultRoute: true,
autoFocus: false,
});
});
});

View file

@ -703,7 +703,7 @@ var AppInfo = {};
itemHelper: componentsPath + "/itemhelper",
itemShortcuts: componentsPath + "/shortcuts",
playQueueManager: componentsPath + "/playback/playqueuemanager",
autoPlayDetect: componentsPath + "/playback/autoPlayDetect",
autoPlayDetect: componentsPath + "/playback/autoplaydetect",
nowPlayingHelper: componentsPath + "/playback/nowplayinghelper",
pluginManager: componentsPath + "/pluginmanager",
packageManager: componentsPath + "/packagemanager"