mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
update components
This commit is contained in:
parent
d61fcea76c
commit
cbaac63619
4 changed files with 19 additions and 15 deletions
|
@ -14,12 +14,12 @@
|
|||
},
|
||||
"devDependencies": {},
|
||||
"ignore": [],
|
||||
"version": "1.4.386",
|
||||
"_release": "1.4.386",
|
||||
"version": "1.4.387",
|
||||
"_release": "1.4.387",
|
||||
"_resolution": {
|
||||
"type": "version",
|
||||
"tag": "1.4.386",
|
||||
"commit": "d7a42d3e191011d585f29c654d58409b853c5034"
|
||||
"tag": "1.4.387",
|
||||
"commit": "9c9c5e0dbbab5107fbf3258f201e2facccbddffa"
|
||||
},
|
||||
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
|
||||
"_target": "^1.2.1",
|
||||
|
|
|
@ -412,11 +412,17 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'embyRouter', 'g
|
|||
}
|
||||
}
|
||||
|
||||
function getShortcutAttributesHtml(item) {
|
||||
|
||||
return 'data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-type="' + item.Type + '" data-mediatype="' + item.MediaType + '" data-channelid="' + item.ChannelId + '" data-isfolder="' + item.IsFolder + '"';
|
||||
}
|
||||
|
||||
return {
|
||||
on: on,
|
||||
off: off,
|
||||
onClick: onClick,
|
||||
showContextMenu: showContextMenu
|
||||
showContextMenu: showContextMenu,
|
||||
getShortcutAttributesHtml: getShortcutAttributesHtml
|
||||
};
|
||||
|
||||
});
|
|
@ -6,7 +6,11 @@ define(['playbackManager', 'userSettings'], function (playbackManager, userSetti
|
|||
|
||||
function playThemeMedia(items, ownerId) {
|
||||
|
||||
if (items.length) {
|
||||
var currentThemeItems = items.filter(function (i) {
|
||||
return enabled(i.MediaType);
|
||||
});
|
||||
|
||||
if (currentThemeItems.length) {
|
||||
|
||||
// Stop if a theme song from another ownerId
|
||||
// Leave it alone if anything else (e.g user playing a movie)
|
||||
|
@ -14,14 +18,12 @@ define(['playbackManager', 'userSettings'], function (playbackManager, userSetti
|
|||
return;
|
||||
}
|
||||
|
||||
currentThemeIds = items.filter(function (i) {
|
||||
return enabled(i.MediaType);
|
||||
}).map(function (i) {
|
||||
currentThemeIds = currentThemeItems.map(function (i) {
|
||||
return i.Id;
|
||||
});
|
||||
|
||||
playbackManager.play({
|
||||
items: items,
|
||||
items: currentThemeItems,
|
||||
fullscreen: false,
|
||||
enableRemotePlayers: false
|
||||
}).then(function () {
|
||||
|
|
|
@ -106,11 +106,7 @@ define(['appSettings', 'events', 'browser'], function (appsettings, events, brow
|
|||
|
||||
val = self.get('enableThemeSongs', false);
|
||||
|
||||
if (val) {
|
||||
return val !== 'false';
|
||||
}
|
||||
|
||||
return true;
|
||||
return val !== 'false';
|
||||
};
|
||||
|
||||
self.enableThemeVideos = function (val) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue