milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add subtitle fix for tizen

Browse source
This commit is contained in:
Luke Pulverenti 2016-11-17 22:12:03 -05:00
parent 220c6197b6
commit 374a543064
14 changed files with 44 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

11
dashboard-ui/scripts/sections.js
View file

@ -295,7 +295,7 @@
getThumbShape();
var supportsImageAnalysis = appHost.supports('imageanalysis');
var cardLayout = supportsImageAnalysis && (viewType === 'music' || !viewType);
var cardLayout = supportsImageAnalysis && (viewType === 'music' || viewType === 'movies' || viewType === 'tvshows' || !viewType);
html += cardBuilder.getCardsHtml({
items: items,
@ -309,9 +309,12 @@
overlayPlayButton: viewType !== 'photos',
allowBottomPadding: !enableScrollX() && !cardLayout,
cardLayout: cardLayout,
showTitle: viewType === 'music' || !viewType,
showParentTitle: viewType === 'music' || !viewType,
vibrant: supportsImageAnalysis && cardLayout
showTitle: viewType === 'music' || !viewType || (cardLayout && (viewType === 'movies' || viewType === 'tvshows')),
showYear: cardLayout && viewType === 'movies',
showSeriesYear: cardLayout && viewType === 'tvshows',
showParentTitle: viewType === 'music' || !viewType || (cardLayout && (viewType === 'tvshows')),
vibrant: supportsImageAnalysis && cardLayout,
lines: 2
});
html += '</div>';
}

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

@ -1368,7 +1368,6 @@ var AppInfo = {};
define('arraypolyfills', [embyWebComponentsBowerPath + '/polyfills/array']);
define('objectassign', [embyWebComponentsBowerPath + '/polyfills/objectassign']);
define('native-promise-only', [bowerPath + '/native-promise-only/lib/npo.src']);
define("clearButtonStyle", ['css!' + embyWebComponentsBowerPath + '/clearbutton']);
define("userdataButtons", [embyWebComponentsBowerPath + "/userdatabuttons/userdatabuttons"], returnFirstDependency);
define("listView", [embyWebComponentsBowerPath + "/listview/listview"], returnFirstDependency);
@ -2792,29 +2791,24 @@ var AppInfo = {};
initRequire();
function onWebComponentsReady() {
function onWebComponentsReady(browser) {
var initialDependencies = [];
initialDependencies.push('browser');
if (!window.Promise) {
initialDependencies.push('native-promise-only');
if (!window.Promise || browser.web0s) {
initialDependencies.push('bower_components/emby-webcomponents/native-promise-only/lib/npo.src');
}
require(initialDependencies, function (browser) {
initRequireWithBrowser(browser);
initRequireWithBrowser(browser);
window.browserInfo = browser;
setAppInfo();
setDocumentClasses(browser);
window.browserInfo = browser;
setAppInfo();
setDocumentClasses(browser);
init();
});
require(initialDependencies, init);
}
onWebComponentsReady();
require(['browser'], onWebComponentsReady);
})();
function pageClassOn(eventName, className, fn) {