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

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
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) { if (AppInfo.enableNowPlayingPageBottomTabs) {
tabs.classList.remove('hide'); tabs.classList.remove('hide');
//page.classList.add('noSecondaryNavPage');
} else { } else {
tabs.classList.add('hide'); tabs.classList.add('hide');
//page.classList.remove('noSecondaryNavPage');
} }
tabs.classList.add('bottom'); tabs.classList.add('bottom');
tabs.alignBottom = true; 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 () { $(tabs).on('iron-select', function () {
page.querySelector('neon-animated-pages').selected = this.selected; page.querySelector('neon-animated-pages').selected = this.selected;
@ -802,8 +800,12 @@
$(page.querySelectorAll('.libraryViewNav a')).on('click', function () { $(page.querySelectorAll('.libraryViewNav a')).on('click', function () {
var newSelected = this.getAttribute('data-index'); 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 () { $(MediaController).on('playerchange', function () {
@ -826,7 +828,19 @@
var tab = window.location.hash; var tab = window.location.hash;
var selected = tab == '#playlist' ? 2 : 0;; 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); updateCastIcon(page);

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

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