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 alpha picker layout quirks

Browse source
This commit is contained in:
Luke Pulverenti 2015-09-08 13:07:35 -04:00
parent a8d73b3114
commit 9293267cb0
3 changed files with 15 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/css/mediaplayer-video.css
View file

@ -17,7 +17,7 @@
left: 0; left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;
background-color: #222; background-color: #000;
color: #fff; color: #fff;
} }

19
dashboard-ui/scripts/backdrops.js
View file

@ -208,24 +208,21 @@
var page = this; var page = this;
if (!page.classList.contains('staticBackdropPage')) { if (page.classList.contains('backdropPage')) {
if (page.classList.contains('backdropPage')) { if (enabled()) {
var type = page.getAttribute('data-backdroptype');
if (enabled()) { var parentId = page.classList.contains('globalBackdropPage') ? '' : LibraryMenu.getTopParentId();
var type = page.getAttribute('data-backdroptype');
var parentId = page.classList.contains('globalBackdropPage') ? '' : LibraryMenu.getTopParentId(); showBackdrop(type, parentId);
showBackdrop(type, parentId);
} else {
page.classList.remove('backdropPage');
clearBackdrop();
}
} else { } else {
page.classList.remove('backdropPage');
clearBackdrop(); clearBackdrop();
} }
} else {
clearBackdrop();
} }
}); });

26
dashboard-ui/scripts/librarybrowser.js
View file

@ -135,10 +135,12 @@
} }
if (typeof ($.browser.androidVersion) == 'number' && !isNaN($.browser.androidVersion)) { if (typeof ($.browser.androidVersion) == 'number' && !isNaN($.browser.androidVersion)) {
return $.browser.androidVersion >= 5; if ($.browser.androidVersion < 5) {
return false;
}
} }
return true; return false;
}, },
configureSwipeTabs: function (ownerpage, tabs, pages) { configureSwipeTabs: function (ownerpage, tabs, pages) {
@ -230,9 +232,8 @@
if (LibraryBrowser.enableFullPaperTabs()) { if (LibraryBrowser.enableFullPaperTabs()) {
tabs.noSlide = true;
if ($.browser.safari) { if ($.browser.safari) {
tabs.noSlide = true;
tabs.noBar = true; tabs.noBar = true;
} else { } else {
LibraryBrowser.configureSwipeTabs(ownerpage, tabs, pages); LibraryBrowser.configureSwipeTabs(ownerpage, tabs, pages);
@ -262,11 +263,10 @@
// When transition animations are used, add a content loading delay to allow the animations to finish // When transition animations are used, add a content loading delay to allow the animations to finish
// Otherwise with both operations happening at the same time, it can cause the animation to not run at full speed. // Otherwise with both operations happening at the same time, it can cause the animation to not run at full speed.
var pgs = this; var pgs = this;
var delay = LibraryBrowser.animatePaperTabs() ? 500 : 0; var delay = LibraryBrowser.animatePaperTabs() || !tabs.noSlide ? 500 : 0;
setTimeout(function () { setTimeout(function () {
$(pgs).trigger('tabchange'); $(pgs).trigger('tabchange');
LibraryBrowser.fixAlphabetPicker(pages);
}, delay); }, delay);
}); });
@ -277,20 +277,6 @@
} }
}, },
fixAlphabetPicker: function (parent) {
if (!$.browser.android || !AppInfo.isNativeApp) {
return;
}
var pickers = parent.querySelectorAll('.alphabetPicker');
for (var i = 0, length = pickers.length; i < length; i++) {
var picker = pickers[i];
picker.classList.add('hide');
picker.classList.remove('hide');
}
},
onTabbedpagebeforeshow: function () { onTabbedpagebeforeshow: function () {
var page = this; var page = this;