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

fix tv screens

Browse source
This commit is contained in:
Luke Pulverenti 2016-07-30 01:42:58 -04:00
parent b160cd48a3
commit e0faf75197
3 changed files with 77 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
dashboard-ui/scripts/episodes.js
View file

@ -48,6 +48,25 @@
return context.savedQueryKey; return context.savedQueryKey;
} }
function onViewStyleChange() {
var viewStyle = self.getCurrentViewStyle();
var itemsContainer = tabContent.querySelector('.itemsContainer');
if (viewStyle == "List") {
itemsContainer.classList.add('vertical-list');
itemsContainer.classList.remove('vertical-wrap');
}
else {
itemsContainer.classList.remove('vertical-list');
itemsContainer.classList.add('vertical-wrap');
}
itemsContainer.innerHTML = '';
}
function reloadItems(page) { function reloadItems(page) {
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
@ -73,6 +92,7 @@
var viewStyle = self.getCurrentViewStyle(); var viewStyle = self.getCurrentViewStyle();
var html; var html;
var itemsContainer = tabContent.querySelector('.itemsContainer');
if (viewStyle == "List") { if (viewStyle == "List") {
@ -83,6 +103,7 @@
}); });
} }
else if (viewStyle == "PosterCard") { else if (viewStyle == "PosterCard") {
html = cardBuilder.getCardsHtml({ html = cardBuilder.getCardsHtml({
items: result.Items, items: result.Items,
shape: "backdrop", shape: "backdrop",
@ -132,7 +153,6 @@
elems[i].addEventListener('click', onPreviousPageClick); elems[i].addEventListener('click', onPreviousPageClick);
} }
var itemsContainer = tabContent.querySelector('.itemsContainer');
itemsContainer.innerHTML = html; itemsContainer.innerHTML = html;
imageLoader.lazyChildren(itemsContainer); imageLoader.lazyChildren(itemsContainer);
@ -226,6 +246,7 @@
var viewStyle = e.detail.viewStyle; var viewStyle = e.detail.viewStyle;
getPageData(tabContent).view = viewStyle; getPageData(tabContent).view = viewStyle;
libraryBrowser.saveViewSetting(getSavedQueryKey(tabContent), viewStyle); libraryBrowser.saveViewSetting(getSavedQueryKey(tabContent), viewStyle);
onViewStyleChange();
reloadItems(tabContent); reloadItems(tabContent);
}); });
} }
@ -235,6 +256,7 @@
}; };
initPage(tabContent); initPage(tabContent);
onViewStyleChange();
self.renderTab = function () { self.renderTab = function () {

32
dashboard-ui/scripts/secondaryitems.js
View file

@ -104,6 +104,24 @@
} }
} }
function onViewStyleChange(parentItem) {
var query = getQuery(parentItem);
var itemsContainer = view.querySelector('#items');
if (query.IncludeItemTypes == "Audio") {
itemsContainer.classList.add('vertical-list');
itemsContainer.classList.remove('vertical-wrap');
} else {
itemsContainer.classList.remove('vertical-list');
itemsContainer.classList.add('vertical-wrap');
}
}
function reloadItems(parentItem) { function reloadItems(parentItem) {
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
@ -125,16 +143,19 @@
view.querySelector('.listTopPaging').innerHTML = pagingHtml; view.querySelector('.listTopPaging').innerHTML = pagingHtml;
var itemsContainer = view.querySelector('#items');
if (query.IncludeItemTypes == "Audio") { if (query.IncludeItemTypes == "Audio") {
html = '<div style="max-width:1000px;margin:auto;">' + listView.getListViewHtml({ html = listView.getListViewHtml({
items: result.Items, items: result.Items,
playFromHere: true, playFromHere: true,
action: 'playallfromhere', action: 'playallfromhere',
smallIcon: true smallIcon: true
}) + '</div>'; });
} else { } else {
var posterOptions = { var posterOptions = {
items: result.Items, items: result.Items,
shape: "auto", shape: "auto",
@ -163,9 +184,8 @@
html = cardBuilder.getCardsHtml(posterOptions); html = cardBuilder.getCardsHtml(posterOptions);
} }
var elem = view.querySelector('#items'); itemsContainer.innerHTML = html + pagingHtml;
elem.innerHTML = html + pagingHtml; ImageLoader.lazyChildren(itemsContainer);
ImageLoader.lazyChildren(elem);
var i, length; var i, length;
var elems; var elems;
@ -201,11 +221,13 @@
ApiClient.getItem(Dashboard.getCurrentUserId(), params.parentId).then(function (parent) { ApiClient.getItem(Dashboard.getCurrentUserId(), params.parentId).then(function (parent) {
LibraryMenu.setTitle(parent.Name); LibraryMenu.setTitle(parent.Name);
onViewStyleChange(parent);
reloadItems(parent); reloadItems(parent);
}); });
} }
else { else {
onViewStyleChange();
reloadItems(); reloadItems();
} }
}); });

33
dashboard-ui/scripts/tvshows.js
View file

@ -1,4 +1,4 @@
define(['events', 'libraryBrowser', 'imageLoader', 'alphaPicker', 'listView', 'emby-itemscontainer'], function (events, libraryBrowser, imageLoader, alphaPicker, listView) { define(['events', 'libraryBrowser', 'imageLoader', 'alphaPicker', 'listView', 'cardBuilder', 'emby-itemscontainer'], function (events, libraryBrowser, imageLoader, alphaPicker, listView, cardBuilder) {
return function (view, params, tabContent) { return function (view, params, tabContent) {
@ -46,6 +46,25 @@
return context.savedQueryKey; return context.savedQueryKey;
} }
function onViewStyleChange() {
var viewStyle = self.getCurrentViewStyle();
var itemsContainer = tabContent.querySelector('.itemsContainer');
if (viewStyle == "List") {
itemsContainer.classList.add('vertical-list');
itemsContainer.classList.remove('vertical-wrap');
}
else {
itemsContainer.classList.remove('vertical-list');
itemsContainer.classList.add('vertical-wrap');
}
itemsContainer.innerHTML = '';
}
function reloadItems(page) { function reloadItems(page) {
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
@ -75,7 +94,7 @@
if (viewStyle == "Thumb") { if (viewStyle == "Thumb") {
html = libraryBrowser.getPosterViewHtml({ html = cardBuilder.getCardsHtml({
items: result.Items, items: result.Items,
shape: "backdrop", shape: "backdrop",
preferThumb: true, preferThumb: true,
@ -86,7 +105,7 @@
} }
else if (viewStyle == "ThumbCard") { else if (viewStyle == "ThumbCard") {
html = libraryBrowser.getPosterViewHtml({ html = cardBuilder.getCardsHtml({
items: result.Items, items: result.Items,
shape: "backdrop", shape: "backdrop",
preferThumb: true, preferThumb: true,
@ -99,7 +118,7 @@
} }
else if (viewStyle == "Banner") { else if (viewStyle == "Banner") {
html = libraryBrowser.getPosterViewHtml({ html = cardBuilder.getCardsHtml({
items: result.Items, items: result.Items,
shape: "banner", shape: "banner",
preferBanner: true, preferBanner: true,
@ -117,7 +136,7 @@
} }
else if (viewStyle == "PosterCard") { else if (viewStyle == "PosterCard") {
html = libraryBrowser.getPosterViewHtml({ html = cardBuilder.getCardsHtml({
items: result.Items, items: result.Items,
shape: "portrait", shape: "portrait",
context: 'tv', context: 'tv',
@ -130,7 +149,7 @@
else { else {
// Poster // Poster
html = libraryBrowser.getPosterViewHtml({ html = cardBuilder.getCardsHtml({
items: result.Items, items: result.Items,
shape: "portrait", shape: "portrait",
context: 'tv', context: 'tv',
@ -276,6 +295,7 @@
getPageData(tabContent).view = viewStyle; getPageData(tabContent).view = viewStyle;
libraryBrowser.saveViewSetting(getSavedQueryKey(tabContent), viewStyle); libraryBrowser.saveViewSetting(getSavedQueryKey(tabContent), viewStyle);
getQuery(tabContent).StartIndex = 0; getQuery(tabContent).StartIndex = 0;
onViewStyleChange();
reloadItems(tabContent); reloadItems(tabContent);
}); });
} }
@ -285,6 +305,7 @@
}; };
initPage(tabContent); initPage(tabContent);
onViewStyleChange();
self.renderTab = function () { self.renderTab = function () {