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

update live tv hls params

This commit is contained in:
Luke Pulverenti 2016-11-16 15:52:17 -05:00
parent dfbe16f07e
commit 6196c5cbb4
7 changed files with 31 additions and 36 deletions

View file

@ -102,9 +102,6 @@
</div> </div>
</div> </div>
<div class="pageTabContent ehsContent fullWidth" id="genresTab" data-index="4"> <div class="pageTabContent ehsContent fullWidth" id="genresTab" data-index="4">
<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>
</div>
<div id="items"></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">

View file

@ -242,16 +242,5 @@
self.preRender(); self.preRender();
self.renderTab(); self.renderTab();
} }
var btnSelectView = tabContent.querySelector('.btnSelectView');
btnSelectView.addEventListener('click', function (e) {
libraryBrowser.showLayoutMenu(e.target, self.getCurrentViewStyle(), self.getViewStyles());
});
btnSelectView.addEventListener('layoutchange', function (e) {
self.setCurrentViewStyle(e.detail.viewStyle);
});
}; };
}); });

View file

@ -1,4 +1,4 @@
define(['libraryBrowser', 'components/categorysyncbuttons', 'cardBuilder', 'dom', 'scrollStyles', 'emby-itemscontainer', 'emby-tabs', 'emby-button'], function (libraryBrowser, categorysyncbuttons, cardBuilder, dom) { define(['libraryBrowser', 'components/categorysyncbuttons', 'cardBuilder', 'dom', 'apphost', 'scrollStyles', 'emby-itemscontainer', 'emby-tabs', 'emby-button'], function (libraryBrowser, categorysyncbuttons, cardBuilder, dom, appHost) {
'use strict'; 'use strict';
function enableScrollX() { function enableScrollX() {
@ -72,13 +72,21 @@
var allowBottomPadding = !enableScrollX(); var allowBottomPadding = !enableScrollX();
var container = page.querySelector('#resumableItems'); var container = page.querySelector('#resumableItems');
var supportsImageAnalysis = appHost.supports('imageanalysis');
var cardLayout = appHost.preferVisualCards;
cardBuilder.buildCards(result.Items, { cardBuilder.buildCards(result.Items, {
itemsContainer: container, itemsContainer: container,
preferThumb: true, preferThumb: true,
shape: getThumbShape(), shape: getThumbShape(),
scalable: true, scalable: true,
overlayPlayButton: true, overlayPlayButton: true,
allowBottomPadding: allowBottomPadding allowBottomPadding: allowBottomPadding,
cardLayout: cardLayout,
vibrant: cardLayout && supportsImageAnalysis,
showTitle: cardLayout,
showYear: cardLayout
}); });
}); });

View file

@ -448,9 +448,15 @@
var screenWidth = dom.getWindowSize().innerWidth; var screenWidth = dom.getWindowSize().innerWidth;
var limit = screenWidth >= 1920 ? 8 : (screenWidth >= 1600 ? 8 : (screenWidth >= 1200 ? 9 : 6)); var limit;
if (!enableScrollX()) { if (enableScrollX()) {
limit = 12;
} else {
limit = screenWidth >= 1920 ? 8 : (screenWidth >= 1600 ? 8 : (screenWidth >= 1200 ? 9 : 6));
limit = Math.min(limit, 5); limit = Math.min(limit, 5);
} }
@ -481,6 +487,10 @@
} else { } else {
html += '<div is="emby-itemscontainer" class="itemsContainer vertical-wrap">'; html += '<div is="emby-itemscontainer" class="itemsContainer vertical-wrap">';
} }
var supportsImageAnalysis = appHost.supports('imageanalysis');
var cardLayout = appHost.preferVisualCards;
html += cardBuilder.getCardsHtml({ html += cardBuilder.getCardsHtml({
items: result.Items, items: result.Items,
preferThumb: true, preferThumb: true,
@ -492,8 +502,12 @@
showDetailsMenu: true, showDetailsMenu: true,
overlayPlayButton: true, overlayPlayButton: true,
context: 'home', context: 'home',
centerText: true, centerText: !cardLayout,
allowBottomPadding: false allowBottomPadding: false,
cardLayout: cardLayout,
showYear: true,
lines: 2,
vibrant: cardLayout && supportsImageAnalysis
}); });
html += '</div>'; html += '</div>';
} }

View file

@ -242,16 +242,5 @@
self.preRender(); self.preRender();
self.renderTab(); self.renderTab();
} }
var btnSelectView = tabContent.querySelector('.btnSelectView');
btnSelectView.addEventListener('click', function (e) {
libraryBrowser.showLayoutMenu(e.target, self.getCurrentViewStyle(), self.getViewStyles());
});
btnSelectView.addEventListener('layoutchange', function (e) {
self.setCurrentViewStyle(e.detail.viewStyle);
});
}; };
}); });

View file

@ -35,7 +35,6 @@
} }
var container = view.querySelector('#nextUpItems'); var container = view.querySelector('#nextUpItems');
var supportsImageAnalysis = appHost.supports('imageanalysis'); var supportsImageAnalysis = appHost.supports('imageanalysis');
cardBuilder.buildCards(result.Items, { cardBuilder.buildCards(result.Items, {
@ -99,6 +98,7 @@
var container = view.querySelector('#resumableItems'); var container = view.querySelector('#resumableItems');
var supportsImageAnalysis = appHost.supports('imageanalysis');
var cardLayout = appHost.preferVisualCards; var cardLayout = appHost.preferVisualCards;
cardBuilder.buildCards(result.Items, { cardBuilder.buildCards(result.Items, {
@ -112,7 +112,8 @@
centerText: !cardLayout, centerText: !cardLayout,
overlayPlayButton: true, overlayPlayButton: true,
allowBottomPadding: allowBottomPadding, allowBottomPadding: allowBottomPadding,
cardLayout: cardLayout cardLayout: cardLayout,
vibrant: supportsImageAnalysis
}); });
}); });
} }

View file

@ -88,9 +88,6 @@
</div> </div>
</div> </div>
<div class="pageTabContent ehsContent fullWidth" id="genresTab" data-index="4"> <div class="pageTabContent ehsContent fullWidth" 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 id="items"></div>
</div> </div>
<div class="pageTabContent ehsContent" id="studiosTab" data-index="5"> <div class="pageTabContent ehsContent" id="studiosTab" data-index="5">