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 components

Browse source
This commit is contained in:
Luke Pulverenti 2016-12-15 22:39:51 -05:00
parent d61fcea76c
commit cbaac63619
4 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View file

@ -14,12 +14,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.4.386", "version": "1.4.387",
"_release": "1.4.386", "_release": "1.4.387",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.4.386", "tag": "1.4.387",
"commit": "d7a42d3e191011d585f29c654d58409b853c5034" "commit": "9c9c5e0dbbab5107fbf3258f201e2facccbddffa"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1", "_target": "^1.2.1",

8
dashboard-ui/bower_components/emby-webcomponents/shortcuts.js vendored
View file

@ -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 { return {
on: on, on: on,
off: off, off: off,
onClick: onClick, onClick: onClick,
showContextMenu: showContextMenu showContextMenu: showContextMenu,
getShortcutAttributesHtml: getShortcutAttributesHtml
}; };
}); });

12
dashboard-ui/bower_components/emby-webcomponents/thememediaplayer.js vendored
View file

@ -6,7 +6,11 @@ define(['playbackManager', 'userSettings'], function (playbackManager, userSetti
function playThemeMedia(items, ownerId) { 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 // Stop if a theme song from another ownerId
// Leave it alone if anything else (e.g user playing a movie) // Leave it alone if anything else (e.g user playing a movie)
@ -14,14 +18,12 @@ define(['playbackManager', 'userSettings'], function (playbackManager, userSetti
return; return;
} }
currentThemeIds = items.filter(function (i) { currentThemeIds = currentThemeItems.map(function (i) {
return enabled(i.MediaType);
}).map(function (i) {
return i.Id; return i.Id;
}); });
playbackManager.play({ playbackManager.play({
items: items, items: currentThemeItems,
fullscreen: false, fullscreen: false,
enableRemotePlayers: false enableRemotePlayers: false
}).then(function () { }).then(function () {

6
dashboard-ui/bower_components/emby-webcomponents/usersettings/usersettingsbuilder.js vendored
View file

@ -106,11 +106,7 @@ define(['appSettings', 'events', 'browser'], function (appsettings, events, brow
val = self.get('enableThemeSongs', false); val = self.get('enableThemeSongs', false);
if (val) { return val !== 'false';
return val !== 'false';
}
return true;
}; };
self.enableThemeVideos = function (val) { self.enableThemeVideos = function (val) {