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 windows restart

Browse source
This commit is contained in:
Luke Pulverenti 2015-09-21 21:05:33 -04:00
parent 4ef47844d8
commit 257a7d2879
18 changed files with 221 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -273,25 +273,20 @@
function fadeOutLeft(elem, iterations) {
var keyframes = [{ opacity: '1', transform: 'none', offset: 0 },
{ opacity: '0', transform: 'translate3d(-100%, 0, 0)', offset: 1 }];
var timing = { duration: 600, iterations: iterations };
var timing = { duration: 400, iterations: iterations };
return elem.animate(keyframes, timing);
}
if (!LibraryBrowser.navigateOnLibraryTabSelect()) {
tabs.addEventListener('iron-select', function () {
var animateTab = !$.browser.safari;
var selected = pages.selected;
if (selected != null) {
if (selected != null && animateTab) {
var newValue = this.selected;
var currentTab = pages.querySelectorAll('.pageTabContent')[selected];
if ($.browser.safari) {
// Need this it flashes the previous content after the animation
currentTab.classList.add('hidingAnimatedTab');
}
fadeOutLeft(currentTab, 1).onfinish = function () {
pages.selected = newValue;
setTimeout(function () { currentTab.classList.remove('hidingAnimatedTab'); }, 500);
};
}
else {
@ -926,16 +921,16 @@
var href = LibraryBrowser.getHrefInternal(item, context);
//if (context != 'livetv') {
// if (topParentId == null && context != 'playlists') {
// topParentId = LibraryMenu.getTopParentId();
// }
if (context == 'tv') {
if (!topParentId) {
topParentId = LibraryMenu.getTopParentId();
}
// if (topParentId) {
// href += href.indexOf('?') == -1 ? "?topParentId=" : "&topParentId=";
// href += topParentId;
// }
//}
if (topParentId) {
href += href.indexOf('?') == -1 ? "?topParentId=" : "&topParentId=";
href += topParentId;
}
}
return href;
},