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

resolve wtv transcoding

This commit is contained in:
Luke Pulverenti 2014-09-09 20:28:59 -04:00
parent 2a8364b21c
commit 8c65052f02
8 changed files with 66 additions and 27 deletions

View file

@ -135,22 +135,30 @@
$('.premiumPackage', page).show(); $('.premiumPackage', page).show();
// Fill in registration info // Fill in registration info
var regStatus = "<strong>"; var regStatus = "";
if (pkg.isRegistered) { if (pkg.isRegistered) {
regStatus += "<p style='color:green;'>";
regStatus += Globalize.translate('MessageFeatureIncludedWithSupporter');
} else { } else {
if (new Date(pkg.expDate).getTime() < new Date(1970, 1, 1).getTime()) { var expDateTime = new Date(pkg.expDate).getTime();
} else { var nowTime = new Date().getTime();
if (new Date(pkg.expDate).getTime() <= new Date().getTime()) {
regStatus += Globalize.translate('MessageTrialExpired');
} else {
regStatus += Globalize.translate('MessageTrialWillExpireIn').replace('{0}', Math.round((new Date(pkg.expDate).getTime() - new Date().getTime()) / (86400000))); 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 += "</strong>"; regStatus += "</p>";
$('#regStatus', page).html(regStatus); $('#regStatus', page).html(regStatus);
if (pluginSecurityInfo.IsMBSupporter) { if (pluginSecurityInfo.IsMBSupporter) {

View file

@ -39,7 +39,13 @@
}); });
html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); var pagingHtml = LibraryBrowser.getQueryPagingHtml({
startIndex: query.StartIndex,
limit: query.Limit,
totalRecordCount: result.TotalRecordCount
});
html += pagingHtml;
$('#items', page).html(html).trigger('create').createCardMenus(); $('#items', page).html(html).trigger('create').createCardMenus();

View file

@ -1,6 +1,6 @@
var LibraryBrowser = (function (window, document, $, screen, store) { var LibraryBrowser = (function (window, document, $, screen, store) {
var pageSizeKey = 'pagesize_v2'; var pageSizeKey = 'pagesize_v3';
$(function () { $(function () {
$("body").on("create", function () { $("body").on("create", function () {
@ -11,18 +11,26 @@
var defaultBackground = "#333"; var defaultBackground = "#333";
return { return {
getDefaultPageSize: function () { getDefaultPageSize: function (key, defaultValue) {
var saved = store.getItem(pageSizeKey); var saved = store.getItem(key || pageSizeKey);
if (saved) { if (saved) {
return parseInt(saved); return parseInt(saved);
} }
if (window.location.toString().toLowerCase().indexOf('localhost') != -1) { if (defaultValue) {
return 100; return defaultValue;
} }
return 50;
// Chrome seems to have virtualization built-in and can handle large lists easily
var isChrome = $.browser.chrome;
if (window.location.toString().toLowerCase().indexOf('localhost') != -1) {
return isChrome ? 200 : 100;
}
return isChrome ? 100 : 50;
}, },
getDefaultItemsView: function (view, mobileView) { getDefaultItemsView: function (view, mobileView) {
@ -1633,7 +1641,7 @@
if (limit && options.updatePageSizeSetting !== false) { if (limit && options.updatePageSizeSetting !== false) {
try { try {
store.setItem(pageSizeKey, limit); store.setItem(options.pageSizeKey || pageSizeKey, limit);
} catch (e) { } catch (e) {
} }

View file

@ -1,5 +1,7 @@
(function ($, document) { (function ($, document) {
var pageSizeKey = 'people';
// The base query options // The base query options
var query = { var query = {
@ -35,7 +37,8 @@
totalRecordCount: result.TotalRecordCount, totalRecordCount: result.TotalRecordCount,
viewButton: true, viewButton: true,
showLimit: false, showLimit: false,
updatePageSizeSetting: false updatePageSizeSetting: false,
pageSizeKey: pageSizeKey
}); });
$('.listTopPaging', page).html(pagingHtml).trigger('create'); $('.listTopPaging', page).html(pagingHtml).trigger('create');
@ -142,7 +145,7 @@
query.ParentId = LibraryMenu.getTopParentId(); query.ParentId = LibraryMenu.getTopParentId();
var limit = LibraryBrowser.getDefaultPageSize(); var limit = LibraryBrowser.getDefaultPageSize(pageSizeKey, 100);
// If the default page size has changed, the start index will have to be reset // If the default page size has changed, the start index will have to be reset
if (limit != query.Limit) { if (limit != query.Limit) {

View file

@ -1,5 +1,7 @@
(function ($, document) { (function ($, document) {
var pageSizeKey = 'people';
var view = LibraryBrowser.getDefaultItemsView('Poster', 'List'); var view = LibraryBrowser.getDefaultItemsView('Poster', 'List');
// The base query options // The base query options
@ -34,7 +36,8 @@
totalRecordCount: result.TotalRecordCount, totalRecordCount: result.TotalRecordCount,
viewButton: true, viewButton: true,
showLimit: false, showLimit: false,
addSelectionButton: true addSelectionButton: true,
pageSizeKey: pageSizeKey
}); });
$('.listTopPaging', page).html(pagingHtml).trigger('create'); $('.listTopPaging', page).html(pagingHtml).trigger('create');
@ -154,7 +157,7 @@
var page = this; var page = this;
query.ParentId = LibraryMenu.getTopParentId(); query.ParentId = LibraryMenu.getTopParentId();
var limit = LibraryBrowser.getDefaultPageSize(); var limit = LibraryBrowser.getDefaultPageSize(pageSizeKey, 100);
// If the default page size has changed, the start index will have to be reset // If the default page size has changed, the start index will have to be reset
if (limit != query.Limit) { if (limit != query.Limit) {

View file

@ -1,5 +1,7 @@
(function ($, document) { (function ($, document) {
var pageSizeKey = 'people';
var view = LibraryBrowser.getDefaultItemsView('Poster', 'List'); var view = LibraryBrowser.getDefaultItemsView('Poster', 'List');
// The base query options // The base query options
@ -34,7 +36,8 @@
totalRecordCount: result.TotalRecordCount, totalRecordCount: result.TotalRecordCount,
viewButton: true, viewButton: true,
showLimit: false, showLimit: false,
addSelectionButton: true addSelectionButton: true,
pageSizeKey: pageSizeKey
}); });
$('.listTopPaging', page).html(pagingHtml).trigger('create'); $('.listTopPaging', page).html(pagingHtml).trigger('create');
@ -155,7 +158,7 @@
query.ParentId = LibraryMenu.getTopParentId(); query.ParentId = LibraryMenu.getTopParentId();
var limit = LibraryBrowser.getDefaultPageSize(); var limit = LibraryBrowser.getDefaultPageSize(pageSizeKey, 100);
// If the default page size has changed, the start index will have to be reset // If the default page size has changed, the start index will have to be reset
if (limit != query.Limit) { if (limit != query.Limit) {

View file

@ -52,8 +52,7 @@
limit: query.Limit, limit: query.Limit,
totalRecordCount: result.TotalRecordCount, totalRecordCount: result.TotalRecordCount,
viewButton: true, viewButton: true,
showLimit: false, showLimit: false
updatePageSizeSetting: false
}); });
$('.listTopPaging', page).html(pagingHtml).trigger('create'); $('.listTopPaging', page).html(pagingHtml).trigger('create');

View file

@ -1,5 +1,7 @@
(function ($, document) { (function ($, document) {
var pageSizeKey = 'people';
// The base query options // The base query options
var query = { var query = {
@ -34,8 +36,7 @@
limit: query.Limit, limit: query.Limit,
totalRecordCount: result.TotalRecordCount, totalRecordCount: result.TotalRecordCount,
viewButton: true, viewButton: true,
showLimit: false, showLimit: false
updatePageSizeSetting: false
}); });
$('.listTopPaging', page).html(pagingHtml).trigger('create'); $('.listTopPaging', page).html(pagingHtml).trigger('create');
@ -151,6 +152,14 @@
query.ParentId = LibraryMenu.getTopParentId(); query.ParentId = LibraryMenu.getTopParentId();
var limit = LibraryBrowser.getDefaultPageSize(pageSizeKey, 100);
// If the default page size has changed, the start index will have to be reset
if (limit != query.Limit) {
query.Limit = limit;
query.StartIndex = 0;
}
LibraryBrowser.loadSavedQueryValues(getSavedQueryKey(), query); LibraryBrowser.loadSavedQueryValues(getSavedQueryKey(), query);
reloadItems(this); reloadItems(this);