From cbaac63619271b7df9a2d263bcb6f7788c512d68 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 15 Dec 2016 22:39:51 -0500 Subject: [PATCH] update components --- .../bower_components/emby-webcomponents/.bower.json | 8 ++++---- .../bower_components/emby-webcomponents/shortcuts.js | 8 +++++++- .../emby-webcomponents/thememediaplayer.js | 12 +++++++----- .../usersettings/usersettingsbuilder.js | 6 +----- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index 3328cd568f..18640520b5 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -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", diff --git a/dashboard-ui/bower_components/emby-webcomponents/shortcuts.js b/dashboard-ui/bower_components/emby-webcomponents/shortcuts.js index 5d8bea6163..885921a40f 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/shortcuts.js +++ b/dashboard-ui/bower_components/emby-webcomponents/shortcuts.js @@ -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 }; }); \ No newline at end of file diff --git a/dashboard-ui/bower_components/emby-webcomponents/thememediaplayer.js b/dashboard-ui/bower_components/emby-webcomponents/thememediaplayer.js index 39ae620a0d..9dfd3d1c0e 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/thememediaplayer.js +++ b/dashboard-ui/bower_components/emby-webcomponents/thememediaplayer.js @@ -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 () { diff --git a/dashboard-ui/bower_components/emby-webcomponents/usersettings/usersettingsbuilder.js b/dashboard-ui/bower_components/emby-webcomponents/usersettings/usersettingsbuilder.js index 4339c4f53b..6d1338118d 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/usersettings/usersettingsbuilder.js +++ b/dashboard-ui/bower_components/emby-webcomponents/usersettings/usersettingsbuilder.js @@ -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) {