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

update lists

This commit is contained in:
Luke Pulverenti 2016-10-03 02:28:45 -04:00
parent 6f73ce4cc3
commit c2290dd41d
33 changed files with 540 additions and 627 deletions

View file

@ -56,139 +56,95 @@
}
}
function populateReviews(id, page) {
ApiClient.getPackageReviews(id, null, null, 3).then(function (positive) {
var html = '';
if (positive && positive.length > 0) {
html += '<div style="margin-top: 2em;" >';
html += '<h3>' + Globalize.translate('HeaderLatestReviews') + '</h3>';
html += "<div><br/>";
for (var i = 0; i < positive.length; i++) {
var review = positive[i];
html += "<div>";
html += "<span class='storeItemReviewText' style='display:inline-flex;align-items:center;'>";
html += new Date(review.timestamp).toDateString();
if (review.rating) {
html += '<i class="md-icon" style="color:#cc3333;height:auto;width:auto;margin-left:.5em;">star</i>';
html += review.rating.toFixed(1);
}
html += " " + review.title;
html += "</span>";
if (review.review) {
html += "<p class='storeItemReviewText'>";
html += review.review;
html += "</p>";
}
html += "</div>";
html += "<hr/>";
}
html += "</div>";
html += "</div>";
}
$('#latestReviews', page).html(html).trigger('create');
});
}
function renderPluginInfo(page, pkg, pluginSecurityInfo) {
if (AppInfo.isNativeApp) {
return;
}
require(['jQuery'], function ($) {
if (pkg.isPremium) {
$('.premiumPackage', page).show();
if (pkg.isPremium) {
$('.premiumPackage', page).show();
// Fill in registration info
var regStatus = "";
if (pkg.isRegistered) {
// Fill in registration info
var regStatus = "";
if (pkg.isRegistered) {
regStatus += "<p style='color:green;'>";
regStatus += "<p style='color:green;'>";
regStatus += Globalize.translate('MessageFeatureIncludedWithSupporter');
} else {
var expDateTime = new Date(pkg.expDate).getTime();
var nowTime = new Date().getTime();
if (expDateTime <= nowTime) {
regStatus += "<p style='color:red;'>";
regStatus += Globalize.translate('MessageTrialExpired');
} else if (expDateTime > new Date(1970, 1, 1).getTime()) {
regStatus += "<p style='color:blue;'>";
regStatus += Globalize.translate('MessageTrialWillExpireIn').replace('{0}', Math.round(expDateTime - nowTime) / (86400000));
}
}
regStatus += "</p>";
$('#regStatus', page).html(regStatus);
if (pluginSecurityInfo.IsMBSupporter) {
$('#regInfo', page).html(pkg.regInfo || "");
$('.premiumDescription', page).hide();
$('.supporterDescription', page).hide();
if (pkg.price > 0) {
$('.premiumHasPrice', page).show();
$('#featureId', page).val(pkg.featureId);
$('#featureName', page).val(pkg.name);
$('#amount', page).val(pkg.price);
$('#regPrice', page).html("<h3>" + Globalize.translate('ValuePriceUSD').replace('{0}', "$" + pkg.price.toFixed(2)) + "</h3>");
$('#ppButton', page).hide();
var url = "https://mb3admin.com/admin/service/user/getPayPalEmail?id=" + pkg.owner;
fetch(url).then(function (response) {
return response.json();
}).then(function (dev) {
if (dev.payPalEmail) {
$('#payPalEmail', page).val(dev.payPalEmail);
$('#ppButton', page).show();
}
});
} else {
// Supporter-only feature
$('.premiumHasPrice', page).hide();
}
} else {
if (pkg.price) {
$('.premiumDescription', page).show();
$('.supporterDescription', page).hide();
$('#regInfo', page).html("");
} else {
$('.premiumDescription', page).hide();
$('.supporterDescription', page).show();
$('#regInfo', page).html("");
}
$('#ppButton', page).hide();
}
regStatus += Globalize.translate('MessageFeatureIncludedWithSupporter');
} else {
$('.premiumPackage', page).hide();
var expDateTime = new Date(pkg.expDate).getTime();
var nowTime = new Date().getTime();
if (expDateTime <= nowTime) {
regStatus += "<p style='color:red;'>";
regStatus += Globalize.translate('MessageTrialExpired');
} else if (expDateTime > new Date(1970, 1, 1).getTime()) {
regStatus += "<p style='color:blue;'>";
regStatus += Globalize.translate('MessageTrialWillExpireIn').replace('{0}', Math.round(expDateTime - nowTime) / (86400000));
}
}
});
regStatus += "</p>";
$('#regStatus', page).html(regStatus);
if (pluginSecurityInfo.IsMBSupporter) {
$('#regInfo', page).html(pkg.regInfo || "");
$('.premiumDescription', page).hide();
$('.supporterDescription', page).hide();
if (pkg.price > 0) {
$('.premiumHasPrice', page).show();
$('#featureId', page).val(pkg.featureId);
$('#featureName', page).val(pkg.name);
$('#amount', page).val(pkg.price);
$('#regPrice', page).html("<h3>" + Globalize.translate('ValuePriceUSD').replace('{0}', "$" + pkg.price.toFixed(2)) + "</h3>");
$('#ppButton', page).hide();
var url = "https://mb3admin.com/admin/service/user/getPayPalEmail?id=" + pkg.owner;
fetch(url).then(function (response) {
return response.json();
}).then(function (dev) {
if (dev.payPalEmail) {
$('#payPalEmail', page).val(dev.payPalEmail);
$('#ppButton', page).show();
}
});
} else {
// Supporter-only feature
$('.premiumHasPrice', page).hide();
}
} else {
if (pkg.price) {
$('.premiumDescription', page).show();
$('.supporterDescription', page).hide();
$('#regInfo', page).html("");
} else {
$('.premiumDescription', page).hide();
$('.supporterDescription', page).show();
$('#regInfo', page).html("");
}
$('#ppButton', page).hide();
}
} else {
$('.premiumPackage', page).hide();
}
}
function renderPackage(pkg, installedPlugins, pluginSecurityInfo, page) {
@ -199,7 +155,6 @@
populateVersions(pkg, page, installedPlugin);
populateHistory(pkg, page);
if (pkg.totalRatings > 0) populateReviews(pkg.id, page);
$('.pluginName', page).html(pkg.name);
@ -228,18 +183,6 @@
renderPluginInfo(page, pkg, pluginSecurityInfo);
//Ratings and Reviews
var ratingHtml = '';
if (pkg.avgRating) {
ratingHtml += '<i class="md-icon" style="color:#cc3333;height:auto;width:auto;">star</i>';
ratingHtml += pkg.avgRating.toFixed(1);
}
ratingHtml += "<span>";
ratingHtml += " " + Globalize.translate('ValueReviewCount').replace('{0}', pkg.totalRatings);
ratingHtml += "</span>";
$('#ratingLine', page).html(ratingHtml);
if (pkg.richDescUrl) {
$('#pViewWebsite', page).show();
$('#pViewWebsite a', page).attr('href', pkg.richDescUrl);
@ -268,62 +211,6 @@
Dashboard.hideLoadingMsg();
}
$(document).on('pageinit', "#addPluginPage", function () {
$('.addPluginForm').off('submit', AddPluginPage.onSubmit).on('submit', AddPluginPage.onSubmit);
}).on('pageshow', "#addPluginPage", function () {
var page = this;
Dashboard.showLoadingMsg();
var name = getParameterByName('name');
var guid = getParameterByName('guid');
var promise1 = ApiClient.getPackageInfo(name, guid);
var promise2 = ApiClient.getInstalledPlugins();
var promise3 = ApiClient.getPluginSecurityInfo();
Promise.all([promise1, promise2, promise3]).then(function (responses) {
renderPackage(responses[0], responses[1], responses[2], page);
});
}).on('pagebeforeshow pageinit pageshow', "#addPluginPage", function () {
// This needs both events for the helpurl to get done at the right time
var page = this;
var context = getParameterByName('context');
$('.notificationsTabs', page).hide();
if (context == 'sync') {
page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Sync');
LibraryMenu.setTitle(Globalize.translate('TitleSync'));
}
else if (context == 'livetv') {
LibraryMenu.setTitle(Globalize.translate('TitleLiveTV'));
page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Live%20TV');
}
else if (context == 'notifications') {
$('.notificationsTabs', page).show();
LibraryMenu.setTitle(Globalize.translate('TitleNotifications'));
page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Notifications');
}
else {
page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Plugins');
LibraryMenu.setTitle(Globalize.translate('TitlePlugins'));
}
});
function performInstallation(page, packageName, guid, updateClass, version) {
var developer = $('#developer', page).html().toLowerCase();
@ -369,18 +256,44 @@
}
}
function addPluginpage() {
function updateHelpUrl(page, params) {
var self = this;
var context = params.context;
self.onSubmit = function () {
$('.notificationsTabs', page).hide();
if (context == 'sync') {
page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Sync');
LibraryMenu.setTitle(Globalize.translate('TitleSync'));
}
else if (context == 'livetv') {
LibraryMenu.setTitle(Globalize.translate('TitleLiveTV'));
page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Live%20TV');
}
else if (context == 'notifications') {
$('.notificationsTabs', page).show();
LibraryMenu.setTitle(Globalize.translate('TitleNotifications'));
page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Notifications');
}
else {
page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Plugins');
LibraryMenu.setTitle(Globalize.translate('TitlePlugins'));
}
}
return function (view, params) {
var onSubmit = function () {
Dashboard.showLoadingMsg();
var page = $(this).parents('#addPluginPage')[0];
var name = getParameterByName('name');
var guid = getParameterByName('guid');
var name = params.name;
var guid = params.guid;
ApiClient.getInstalledPlugins().then(function (plugins) {
@ -407,8 +320,37 @@
return false;
};
}
window.AddPluginPage = new addPluginpage();
$('.addPluginForm', view).on('submit', onSubmit);
updateHelpUrl(view, params);
view.addEventListener('viewbeforeshow', function () {
var page = this;
updateHelpUrl(page, params);
});
view.addEventListener('viewshow', function () {
var page = this;
Dashboard.showLoadingMsg();
var name = params.name;
var guid = params.guid;
var promise1 = ApiClient.getPackageInfo(name, guid);
var promise2 = ApiClient.getInstalledPlugins();
var promise3 = ApiClient.getPluginSecurityInfo();
Promise.all([promise1, promise2, promise3]).then(function (responses) {
renderPackage(responses[0], responses[1], responses[2], page);
});
updateHelpUrl(page, params);
});
};
});

View file

@ -207,12 +207,6 @@
}
});
if (user.Policy.IsAdministrator) {
page.querySelector('.chapterSettingsButton').classList.remove('hide');
} else {
page.querySelector('.chapterSettingsButton').classList.add('hide');
}
var itemBirthday = page.querySelector('#itemBirthday');
if (item.Type == "Person" && item.PremiereDate) {
@ -2172,10 +2166,6 @@
}
view.querySelector('.chapterSettingsButton').addEventListener('click', function () {
Dashboard.navigate('librarysettings.html');
});
view.addEventListener('viewbeforeshow', function () {
var page = this;
reload(page, params);

View file

@ -265,6 +265,10 @@
// Handle search hints
var id = item.Id || item.ItemId;
if (item.Type == "SeriesTimer") {
return "livetvseriestimer.html?id=" + id;
}
if (item.CollectionType == 'livetv') {
return 'livetv.html';
}

View file

@ -27,7 +27,9 @@
enableUserDataButtons: false,
showParentTitle: true,
image: false,
showProgramTimeColumn: true
showProgramTime: true,
mediaInfo: false,
parentTitleWithTitle: true
}) + '</div>';
}

View file

@ -1,4 +1,4 @@
define(['datetime', 'cardBuilder'], function (datetime, cardBuilder) {
define(['datetime', 'cardBuilder', 'listView'], function (datetime, cardBuilder, listView) {
function enableScrollX() {
return browserInfo.mobile && AppInfo.enableAppLayouts;
@ -8,101 +8,6 @@
return enableScrollX() ? 'overflowBackdrop' : 'backdrop';
}
function getProgramScheduleHtml(items, options) {
options = options || {};
var groups = [];
var currentGroupName = '';
var currentGroup = [];
var i, length;
for (i = 0, length = items.length; i < length; i++) {
var item = items[i];
var dateText = '';
if (options.indexByDate !== false && item.StartDate) {
try {
var premiereDate = datetime.parseISO8601Date(item.StartDate, true);
dateText = LibraryBrowser.getFutureDateText(premiereDate, true);
} catch (err) {
}
}
if (dateText != currentGroupName) {
if (currentGroup.length) {
groups.push({
name: currentGroupName,
items: currentGroup
});
}
currentGroupName = dateText;
currentGroup = [item];
} else {
currentGroup.push(item);
}
}
if (currentGroup.length) {
groups.push({
name: currentGroupName,
items: currentGroup
});
}
var html = '';
for (i = 0, length = groups.length; i < length; i++) {
var group = groups[i];
if (group.name) {
html += '<div class="homePageSection">';
html += '<h1 class="listHeader">' + group.name + '</h1>';
}
if (enableScrollX()) {
html += '<div is="emby-itemscontainer" class="itemsContainer hiddenScrollX">';
} else {
html += '<div is="emby-itemscontainer" class="itemsContainer vertical-wrap">';
}
html += cardBuilder.getCardsHtml({
items: group.items,
shape: getBackdropShape(),
preferThumb: true,
showTitle: true,
showAirTime: true,
showAirEndTime: true,
showChannelName: true,
cardLayout: true,
action: 'programdialog',
cardFooterAside: 'none',
preferThumb: true,
coverImage: true,
overlayText: false
});
html += '</div>';
if (group.name) {
html += '</div>';
}
}
return Promise.resolve(html);
}
function getTimersHtml(timers, options) {
options = options || {};
@ -204,8 +109,7 @@
window.LiveTvHelpers = {
getTimersHtml: getTimersHtml,
getProgramScheduleHtml: getProgramScheduleHtml
getTimersHtml: getTimersHtml
};
});

View file

@ -92,13 +92,9 @@
ImageLoader.lazyChildren(recordingItems);
}
function renderActiveRecordings(context) {
function renderActiveRecordings(context, promise) {
ApiClient.getLiveTvTimers({
IsActive: true
}).then(function (result) {
promise.then(function (result) {
// The IsActive param is new, so handle older servers that don't support it
if (result.Items.length && result.Items[0].Status != 'InProgress') {
@ -111,18 +107,9 @@
});
}
function renderLatestRecordings(context) {
function renderLatestRecordings(context, promise) {
ApiClient.getLiveTvRecordings({
UserId: Dashboard.getCurrentUserId(),
Limit: enableScrollX() ? 12 : 8,
IsInProgress: false,
Fields: 'CanDelete,PrimaryImageAspectRatio,BasicSyncInfo',
EnableTotalRecordCount: false,
EnableImageTypes: "Primary,Thumb,Backdrop"
}).then(function (result) {
promise.then(function (result) {
renderRecordings(context.querySelector('#latestRecordings'), result.Items);
@ -130,18 +117,9 @@
});
}
function renderMovieRecordings(context) {
function renderMovieRecordings(context, promise) {
ApiClient.getLiveTvRecordings({
UserId: Dashboard.getCurrentUserId(),
Limit: enableScrollX() ? 12 : 8,
IsInProgress: false,
Fields: 'CanDelete,PrimaryImageAspectRatio,BasicSyncInfo',
EnableTotalRecordCount: false,
IsMovie: true
}).then(function (result) {
promise.then(function (result) {
renderRecordings(context.querySelector('#movieRecordings'), result.Items, {
showYear: true,
@ -150,18 +128,9 @@
});
}
function renderEpisodeRecordings(context) {
function renderEpisodeRecordings(context, promise) {
ApiClient.getLiveTvRecordingSeries({
UserId: Dashboard.getCurrentUserId(),
Limit: enableScrollX() ? 12 : 8,
IsInProgress: false,
Fields: 'CanDelete,PrimaryImageAspectRatio,BasicSyncInfo',
EnableTotalRecordCount: false,
IsSeries: true
}).then(function (result) {
promise.then(function (result) {
renderRecordings(context.querySelector('#episodeRecordings'), result.Items, {
showItemCounts: true,
@ -170,18 +139,9 @@
});
}
function renderSportsRecordings(context) {
function renderSportsRecordings(context, promise) {
ApiClient.getLiveTvRecordings({
UserId: Dashboard.getCurrentUserId(),
Limit: enableScrollX() ? 12 : 8,
IsInProgress: false,
Fields: 'CanDelete,PrimaryImageAspectRatio,BasicSyncInfo',
EnableTotalRecordCount: false,
IsSports: true
}).then(function (result) {
promise.then(function (result) {
renderRecordings(context.querySelector('#sportsRecordings'), result.Items, {
showYear: true,
@ -190,18 +150,9 @@
});
}
function renderKidsRecordings(context) {
function renderKidsRecordings(context, promise) {
ApiClient.getLiveTvRecordings({
UserId: Dashboard.getCurrentUserId(),
Limit: enableScrollX() ? 12 : 8,
IsInProgress: false,
Fields: 'CanDelete,PrimaryImageAspectRatio,BasicSyncInfo',
EnableTotalRecordCount: false,
IsKids: true
}).then(function (result) {
promise.then(function (result) {
renderRecordings(context.querySelector('#kidsRecordings'), result.Items, {
showYear: true,
@ -228,27 +179,6 @@
});
}
function reload(context) {
Dashboard.showLoadingMsg();
renderActiveRecordings(context);
renderLatestRecordings(context);
renderMovieRecordings(context);
renderEpisodeRecordings(context);
renderSportsRecordings(context);
renderKidsRecordings(context);
ApiClient.getLiveTvRecordingGroups({
userId: Dashboard.getCurrentUserId()
}).then(function (result) {
renderRecordingGroups(context, result.Items);
});
}
function onMoreClick(e) {
var type = this.getAttribute('data-type');
@ -280,6 +210,12 @@
return function (view, params, tabContent) {
var self = this;
var activeRecordingsPromise;
var sportsPromise;
var kidsPromise;
var moviesPromise;
var seriesPromise;
var latestPromise;
categorysyncbuttons.init(tabContent);
@ -288,11 +224,83 @@
moreButtons[i].addEventListener('click', onMoreClick);
}
tabContent.querySelector('#activeRecordings .recordingItems').addEventListener('timercancelled', function () {
reload(tabContent);
self.preRender();
self.renderTab();
});
self.preRender = function () {
activeRecordingsPromise = ApiClient.getLiveTvTimers({
IsActive: true
});
latestPromise = ApiClient.getLiveTvRecordings({
UserId: Dashboard.getCurrentUserId(),
Limit: enableScrollX() ? 12 : 8,
IsInProgress: false,
Fields: 'CanDelete,PrimaryImageAspectRatio,BasicSyncInfo',
EnableTotalRecordCount: false,
EnableImageTypes: "Primary,Thumb,Backdrop"
});
moviesPromise = ApiClient.getLiveTvRecordings({
UserId: Dashboard.getCurrentUserId(),
Limit: enableScrollX() ? 12 : 8,
IsInProgress: false,
Fields: 'CanDelete,PrimaryImageAspectRatio,BasicSyncInfo',
EnableTotalRecordCount: false,
IsMovie: true
});
seriesPromise = ApiClient.getLiveTvRecordingSeries({
UserId: Dashboard.getCurrentUserId(),
Limit: enableScrollX() ? 12 : 8,
IsInProgress: false,
Fields: 'CanDelete,PrimaryImageAspectRatio,BasicSyncInfo',
EnableTotalRecordCount: false,
IsSeries: true
});
kidsPromise = ApiClient.getLiveTvRecordings({
UserId: Dashboard.getCurrentUserId(),
Limit: enableScrollX() ? 12 : 8,
IsInProgress: false,
Fields: 'CanDelete,PrimaryImageAspectRatio,BasicSyncInfo',
EnableTotalRecordCount: false,
IsKids: true
});
sportsPromise = ApiClient.getLiveTvRecordings({
UserId: Dashboard.getCurrentUserId(),
Limit: enableScrollX() ? 12 : 8,
IsInProgress: false,
Fields: 'CanDelete,PrimaryImageAspectRatio,BasicSyncInfo',
EnableTotalRecordCount: false,
IsSports: true
});
};
self.renderTab = function () {
reload(tabContent);
Dashboard.showLoadingMsg();
renderActiveRecordings(tabContent, activeRecordingsPromise);
renderLatestRecordings(tabContent, latestPromise);
renderMovieRecordings(tabContent, moviesPromise);
renderEpisodeRecordings(tabContent, seriesPromise);
renderSportsRecordings(tabContent, sportsPromise);
renderKidsRecordings(tabContent, kidsPromise);
ApiClient.getLiveTvRecordingGroups({
userId: Dashboard.getCurrentUserId()
}).then(function (result) {
renderRecordingGroups(tabContent, result.Items);
});
};
};

View file

@ -1,12 +1,8 @@
define(['scripts/livetvcomponents', 'emby-button', 'emby-itemscontainer'], function () {
function renderActiveRecordings(context) {
function renderActiveRecordings(context, promise) {
ApiClient.getLiveTvTimers({
IsActive: true
}).then(function (result) {
promise.then(function (result) {
// The IsActive param is new, so handle older servers that don't support it
if (result.Items.length && result.Items[0].Status != 'InProgress') {
@ -18,7 +14,7 @@
});
});
}
function renderTimers(context, timers, options) {
LiveTvHelpers.getTimersHtml(timers, options).then(function (html) {
@ -37,35 +33,41 @@
});
}
function renderUpcomingRecordings(context) {
function renderUpcomingRecordings(context, promise) {
ApiClient.getLiveTvTimers({
IsActive: false
}).then(function (result) {
promise.then(function (result) {
renderTimers(context.querySelector('#upcomingRecordings'), result.Items);
Dashboard.hideLoadingMsg();
});
}
function reload(context) {
Dashboard.showLoadingMsg();
renderActiveRecordings(context);
renderUpcomingRecordings(context);
}
return function (view, params, tabContent) {
var self = this;
var activeRecordingsPromise;
var upcomingRecordingsPromise;
tabContent.querySelector('#upcomingRecordings .recordingItems').addEventListener('timercancelled', function () {
reload(tabContent);
self.preRender();
self.renderTab();
});
self.preRender = function () {
activeRecordingsPromise = ApiClient.getLiveTvTimers({
IsActive: true
});
upcomingRecordingsPromise = ApiClient.getLiveTvTimers({
IsActive: false
});
};
self.renderTab = function () {
reload(tabContent);
Dashboard.showLoadingMsg();
renderActiveRecordings(tabContent, activeRecordingsPromise);
renderUpcomingRecordings(tabContent, upcomingRecordingsPromise);
};
};

View file

@ -1,4 +1,4 @@
define(['datetime', 'dom', 'seriesRecordingEditor', 'emby-itemscontainer'], function (datetime, dom, seriesRecordingEditor) {
define(['datetime', 'dom', 'seriesRecordingEditor', 'listView', 'emby-itemscontainer'], function (datetime, dom, seriesRecordingEditor, listView) {
return function (view, params) {
@ -9,6 +9,27 @@
Dashboard.hideLoadingMsg();
}
function getProgramScheduleHtml(items, options) {
options = options || {};
var html = '';
html += '<div is="emby-itemscontainer" class="itemsContainer vertical-list">';
html += listView.getListViewHtml({
items: items,
enableUserDataButtons: false,
image: false,
showProgramDateTime: true,
mediaInfo: false,
action: 'none',
moreButton: false
});
html += '</div>';
return html;
}
function renderSchedule(page) {
ApiClient.getLiveTvPrograms({
@ -28,24 +49,13 @@
result.Items = [];
}
LiveTvHelpers.getProgramScheduleHtml(result.Items).then(function (html) {
var html = getProgramScheduleHtml(result.Items);
var scheduleTab = page.querySelector('.scheduleTab');
scheduleTab.innerHTML = html;
var scheduleTab = page.querySelector('.scheduleTab');
scheduleTab.innerHTML = html;
ImageLoader.lazyChildren(scheduleTab);
});
ImageLoader.lazyChildren(scheduleTab);
});
//var timers = result.Items;
//LiveTvHelpers.getTimersHtml(timers).then(function (html) {
// var scheduleTab = page.querySelector('.scheduleTab');
// scheduleTab.innerHTML = html;
// ImageLoader.lazyChildren(scheduleTab);
//});
}
function reload() {

View file

@ -1,4 +1,4 @@
define(['datetime', 'paper-icon-button-light', 'emby-button', 'listViewStyle'], function (datetime) {
define(['datetime', 'cardBuilder', 'paper-icon-button-light', 'emby-button'], function (datetime, cardBuilder) {
var query = {
@ -30,75 +30,88 @@
var html = '';
if (timers.length) {
html += '<div class="paperList">';
}
html += cardBuilder.getCardsHtml({
items: timers,
shape: 'backdrop',
showTitle: true,
cardLayout: true,
cardFooterAside: 'none',
preferThumb: true,
coverImage: true,
overlayText: false,
showSeriesTimerTime: true,
showSeriesTimerChannel: true
});
for (var i = 0, length = timers.length; i < length; i++) {
//if (timers.length) {
// html += '<div class="paperList">';
//}
var timer = timers[i];
//for (var i = 0, length = timers.length; i < length; i++) {
html += '<div class="listItem">';
// var timer = timers[i];
html += '<i class="md-icon listItemIcon">live_tv</i>';
// html += '<div class="listItem">';
html += '<div class="listItemBody three-line">';
html += '<a class="clearLink" href="livetvseriestimer.html?id=' + timer.Id + '">';
html += '<h3 class="listItemBodyText">';
html += timer.Name;
html += '</h3>';
// html += '<i class="md-icon listItemIcon">live_tv</i>';
html += '<div class="secondary">';
if (timer.DayPattern) {
html += timer.DayPattern;
}
else {
var days = timer.Days || [];
// html += '<div class="listItemBody three-line">';
// html += '<a class="clearLink" href="livetvseriestimer.html?id=' + timer.Id + '">';
// html += '<h3 class="listItemBodyText">';
// html += timer.Name;
// html += '</h3>';
html += days.join(', ');
}
// html += '<div class="secondary">';
// if (timer.DayPattern) {
// html += timer.DayPattern;
// }
// else {
// var days = timer.Days || [];
if (timer.RecordAnyTime) {
// html += days.join(', ');
// }
html += ' - ' + Globalize.translate('LabelAnytime');
} else {
html += ' - ' + datetime.getDisplayTime(timer.StartDate);
}
html += '</div>';
// if (timer.RecordAnyTime) {
html += '<div class="secondary">';
if (timer.RecordAnyChannel) {
html += Globalize.translate('LabelAllChannels');
}
else if (timer.ChannelId) {
html += timer.ChannelName;
}
html += '</div>';
// html += ' - ' + Globalize.translate('LabelAnytime');
// } else {
// html += ' - ' + datetime.getDisplayTime(timer.StartDate);
// }
// html += '</div>';
html += '</a>';
html += '</div>';
// html += '<div class="secondary">';
// if (timer.RecordAnyChannel) {
// html += Globalize.translate('LabelAllChannels');
// }
// else if (timer.ChannelId) {
// html += timer.ChannelName;
// }
// html += '</div>';
html += '<button type="button" is="paper-icon-button-light" data-seriestimerid="' + timer.Id + '" title="' + Globalize.translate('ButtonCancelSeries') + '" class="btnCancelSeries autoSize"><i class="md-icon">cancel</i></button>';
// html += '</a>';
// html += '</div>';
html += '</div>';
}
// html += '<button type="button" is="paper-icon-button-light" data-seriestimerid="' + timer.Id + '" title="' + Globalize.translate('ButtonCancelSeries') + '" class="btnCancelSeries autoSize"><i class="md-icon">cancel</i></button>';
if (timers.length) {
html += '</div>';
}
// html += '</div>';
//}
//if (timers.length) {
// html += '</div>';
//}
var elem = context.querySelector('#items');
elem.innerHTML = html;
if (timers.length) {
elem.querySelector('.paperList').addEventListener('click', function (e) {
//if (timers.length) {
// elem.querySelector('.paperList').addEventListener('click', function (e) {
var btnCancelSeries = parentWithClass(e.target, 'btnCancelSeries');
if (btnCancelSeries) {
deleteSeriesTimer(context, btnCancelSeries.getAttribute('data-seriestimerid'));
}
});
}
// var btnCancelSeries = parentWithClass(e.target, 'btnCancelSeries');
// if (btnCancelSeries) {
// deleteSeriesTimer(context, btnCancelSeries.getAttribute('data-seriestimerid'));
// }
// });
//}
Dashboard.hideLoadingMsg();
}
@ -116,11 +129,11 @@
return elem;
}
function reload(context) {
function reload(context, promise) {
Dashboard.showLoadingMsg();
ApiClient.getLiveTvSeriesTimers(query).then(function (result) {
promise.then(function (result) {
renderTimers(context, result.Items);
});
@ -129,9 +142,13 @@
return function (view, params, tabContent) {
var self = this;
self.renderTab = function () {
var timersPromise; self.preRender = function () {
timersPromise = ApiClient.getLiveTvSeriesTimers(query);
};
self.renderTab = function () {
reload(tabContent);
reload(tabContent, timersPromise);
};
};

View file

@ -168,9 +168,11 @@
var tabControllers = [];
var renderedTabs = [];
function loadTab(page, index) {
var tabControllers = [];
var renderedTabs = [];
function getTabController(page, index, callback) {
var tabContent = page.querySelector('.pageTabContent[data-index=\'' + index + '\']');
var depends = [];
switch (index) {
@ -178,23 +180,18 @@
case 0:
break;
case 1:
document.body.classList.add('autoScrollY');
depends.push('scripts/livetvguide');
break;
case 2:
document.body.classList.remove('autoScrollY');
depends.push('scripts/livetvchannels');
break;
case 3:
document.body.classList.remove('autoScrollY');
depends.push('scripts/livetvrecordings');
break;
case 4:
document.body.classList.remove('autoScrollY');
depends.push('scripts/livetvschedule');
break;
case 5:
document.body.classList.remove('autoScrollY');
depends.push('scripts/livetvseriestimers');
break;
default:
@ -202,12 +199,14 @@
}
require(depends, function (controllerFactory) {
var tabContent;
if (index == 0) {
tabContent = view.querySelector('.pageTabContent[data-index=\'' + index + '\']');
self.tabContent = tabContent;
}
var controller = tabControllers[index];
if (!controller) {
tabContent = view.querySelector('.pageTabContent[data-index=\'' + index + '\']');
controller = index ? new controllerFactory(view, params, tabContent) : self;
tabControllers[index] = controller;
@ -216,8 +215,37 @@
}
}
callback(controller);
});
}
function preLoadTab(page, index) {
getTabController(page, index, function (controller) {
if (renderedTabs.indexOf(index) == -1) {
renderedTabs.push(index);
if (controller.preRender) {
controller.preRender();
}
}
});
}
function loadTab(page, index) {
getTabController(page, index, function (controller) {
if (index === 1) {
document.body.classList.add('autoScrollY');
} else {
document.body.classList.remove('autoScrollY');
}
if (renderedTabs.indexOf(index) == -1) {
if (index < 2) {
renderedTabs.push(index);
}
controller.renderTab();
}
});
@ -227,6 +255,10 @@
libraryBrowser.configurePaperLibraryTabs(view, viewTabs, view.querySelectorAll('.pageTabContent'), [0, 2, 3, 4, 5]);
viewTabs.addEventListener('beforetabchange', function (e) {
preLoadTab(view, parseInt(e.detail.selectedTabIndex));
});
viewTabs.addEventListener('tabchange', function (e) {
loadTab(view, parseInt(e.detail.selectedTabIndex));
});

View file

@ -141,8 +141,7 @@
shape: "auto",
context: 'movies',
showTitle: true,
showYear: true,
lazy: true,
centerText: false,
cardLayout: true,
showItemCounts: true
});

View file

@ -38,7 +38,7 @@
itemHtml += '<i class="listItemIcon md-icon" style="background-color:#999;">notifications_off</i>';
}
itemHtml += '<div class="listItemBody two-line">';
itemHtml += '<div class="listItemBody">';
itemHtml += '<div class="listItemBodyText">' + i.Name + '</div>';
itemHtml += '</div>';

View file

@ -693,8 +693,10 @@
lazy: true,
showDetailsMenu: true,
centerText: true,
overlayText: false,
overlayPlayButton: true,
allowBottomPadding: !enableScrollX()
allowBottomPadding: !enableScrollX(),
preferThumb: true
});
html += '</div>';

View file

@ -1850,7 +1850,8 @@ var AppInfo = {};
path: '/addplugin.html',
dependencies: [],
autoFocus: false,
roles: 'admin'
roles: 'admin',
controller: 'scripts/addpluginpage'
});
defineRoute({
@ -2719,8 +2720,8 @@ var AppInfo = {};
// Prefer custom font over Segoe if on desktop windows
if (!browserInfo.mobile && navigator.userAgent.toLowerCase().indexOf('windows') != -1) {
postInitDependencies.push('opensansFont');
//postInitDependencies.push('robotoFont');
//postInitDependencies.push('opensansFont');
postInitDependencies.push('robotoFont');
}
postInitDependencies.push('bower_components/emby-webcomponents/input/api');