1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

update xml parsing

This commit is contained in:
Luke Pulverenti 2016-12-02 15:10:35 -05:00
parent c22321c3f9
commit 7ce49ea1e8
9 changed files with 88 additions and 78 deletions

View file

@ -14,12 +14,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.4.363",
"_release": "1.4.363",
"version": "1.4.365",
"_release": "1.4.365",
"_resolution": {
"type": "version",
"tag": "1.4.363",
"commit": "391923397ea7ea23890ced20153fc896e8892f31"
"tag": "1.4.365",
"commit": "a946b2cfd0bc2fd99121a18cc236f1ce02ad5cf8"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1",

View file

@ -252,21 +252,20 @@
var rotationInterval;
var currentRotatingImages = [];
var currentRotationIndex = -1;
function setBackdrops(items, imageSetId) {
function setBackdrops(items, enableRotation) {
var images = getImageUrls(items);
imageSetId = imageSetId || new Date().getTime();
if (images.length) {
startRotation(images, imageSetId);
startRotation(images, enableRotation);
} else {
clearBackdrop();
}
}
function startRotation(images) {
function startRotation(images, enableImageRotation) {
if (arraysEqual(images, currentRotatingImages)) {
return;
@ -277,7 +276,7 @@
currentRotatingImages = images;
currentRotationIndex = -1;
if (images.length > 1 && enableRotation()) {
if (images.length > 1 && enableRotation() && enableImageRotation !== false) {
rotationInterval = setInterval(onRotationInterval, 20000);
}
onRotationInterval();

View file

@ -50,13 +50,13 @@
.fab {
display: inline-flex;
border-radius: 50%;
background-color: #444;
background-color: rgb(170,170, 170);
padding: .6em;
box-sizing: border-box;
align-items: center;
justify-content: center;
text-align: center;
color: #fff;
color: #222;
margin: 0;
}

View file

@ -14,19 +14,19 @@ define(['playbackManager', 'userSettings'], function (playbackManager, userSetti
return;
}
if (enabled(items[0].MediaType)) {
currentThemeIds = items.map(function (i) {
return i.Id;
});
currentThemeIds = items.filter(function (i) {
return enabled(i.MediaType);
}).map(function (i) {
return i.Id;
});
playbackManager.play({
items: items,
fullscreen: false,
enableRemotePlayers: false
}).then(function () {
currentOwnerId = ownerId;
});
}
playbackManager.play({
items: items,
fullscreen: false,
enableRemotePlayers: false
}).then(function () {
currentOwnerId = ownerId;
});
} else {

View file

@ -1,7 +1,3 @@
.btnUserData {
color: #aaa;
}
.btnUserDataOn {
color: #cc3333 !important;
}