cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-17 19:08:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

update now playing

Browse Source
This commit is contained in:
Luke Pulverenti 2015-09-26 10:56:11 -04:00
parent b5a723314b
commit fc4068bdcc
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dashboard-ui/scripts/nowplayingpage.js
View File

@ -776,15 +776,13 @@
if (AppInfo.enableNowPlayingPageBottomTabs) {
tabs.classList.remove('hide');
//page.classList.add('noSecondaryNavPage');
} else {
tabs.classList.add('hide');
//page.classList.remove('noSecondaryNavPage');
}
tabs.classList.add('bottom');
tabs.alignBottom = true;
LibraryBrowser.configureSwipeTabs(page, tabs, page.querySelectorAll('neon-animated-pages')[0]);
LibraryBrowser.configureSwipeTabs(page, tabs, page.querySelector('neon-animated-pages'));
$(tabs).on('iron-select', function () {
page.querySelector('neon-animated-pages').selected = this.selected;
@ -802,8 +800,12 @@
$(page.querySelectorAll('.libraryViewNav a')).on('click', function () {
var newSelected = this.getAttribute('data-index');
tabs.selected = newSelected;
page.querySelector('neon-animated-pages').selected = newSelected;
if (AppInfo.enableNowPlayingPageBottomTabs) {
tabs.selected = newSelected;
} else {
page.querySelector('neon-animated-pages').selected = newSelected;
}
});
$(MediaController).on('playerchange', function () {
@ -826,7 +828,19 @@
var tab = window.location.hash;
var selected = tab == '#playlist' ? 2 : 0;;
this.querySelectorAll('paper-tabs')[0].selected = selected;
this.querySelector('paper-tabs').selected = selected;
if (AppInfo.enableNowPlayingPageBottomTabs) {
this.querySelector('paper-tabs').selected = selected;
} else {
// hack alert. doing this because the neon elements don't seem to be initialized yet
setTimeout(function() {
page.querySelector('neon-animated-pages').selected = selected;
}, 1000);
}
updateCastIcon(page);

2
dashboard-ui/scripts/site.js
View File

@ -1729,7 +1729,6 @@ var AppInfo = {};
AppInfo.enableCustomHomeSections = true;
AppInfo.enableHomeTabs = true;
AppInfo.enableNowPlayingPageBottomTabs = true;
AppInfo.enableNowPlayingPageBottomTabs = false;
AppInfo.enableAppStorePolicy = isCordova;
@ -1946,7 +1945,6 @@ var AppInfo = {};
Dashboard.importCss('themes/ios.css');
}
}
Dashboard.importCss('themes/ios.css');
if ($.browser.msie && $.browser.tv && ($.browser.version || 11) <= 10) {
Dashboard.importCss('thirdparty/paper-ie10.css');