diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index 6559f7a7dd..8290be0f18 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.465", - "_release": "1.4.465", + "version": "1.4.466", + "_release": "1.4.466", "_resolution": { "type": "version", - "tag": "1.4.465", - "commit": "13b0fddbfbc24ac9dff0db7007be0cde3a94aed2" + "tag": "1.4.466", + "commit": "ae0866aa2337e97515ea80a82a813b17ef662613" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.1", diff --git a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js index 8e75fc6b07..b4aee60549 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js +++ b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js @@ -247,6 +247,9 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana else if (options.shape === 'square') { options.width = options.width || 243; } + else if (options.shape === 'banner') { + options.width = options.width || 800; + } } options.width = options.width || getImageWidth(options.shape); @@ -504,6 +507,9 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana if (shape.indexOf('square') !== -1) { return 1; } + if (shape.indexOf('banner') !== -1) { + return (1000 / 185); + } } return null; } diff --git a/dashboard-ui/bower_components/emby-webcomponents/listview/listview.js b/dashboard-ui/bower_components/emby-webcomponents/listview/listview.js index 3869a61a95..51a13db39f 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/listview/listview.js +++ b/dashboard-ui/bower_components/emby-webcomponents/listview/listview.js @@ -398,6 +398,10 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan if (!clickEntireItem) { + if (options.queueButton) { + html += ''; + } + if (options.moreButton !== false) { html += ''; } diff --git a/dashboard-ui/bower_components/emby-webcomponents/playback/playbackmanager.js b/dashboard-ui/bower_components/emby-webcomponents/playback/playbackmanager.js index 6dcf1949ee..045c571878 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/playback/playbackmanager.js +++ b/dashboard-ui/bower_components/emby-webcomponents/playback/playbackmanager.js @@ -2355,7 +2355,36 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g return player.queue(item); } - // TODO + if (options.items) { + + return translateItemsForPlayback(options.items, options).then(function (items) { + + queueAll(items, mode); + }); + + } else { + + if (!options.serverId) { + throw new Error('serverId required!'); + } + + return getItemsForPlayback(options.serverId, { + + Ids: options.ids.join(',') + + }).then(function (result) { + + return translateItemsForPlayback(result.Items, options).then(function (items) { + queueAll(items, mode); + }); + }); + } + } + + function queueAll(items, mode) { + for (var i = 0, length = items.length; i < length; i++) { + playlist.push(items[i]); + } } function onPlaybackStarted(player, streamInfo, mediaSource) { diff --git a/dashboard-ui/bower_components/emby-webcomponents/shortcuts.js b/dashboard-ui/bower_components/emby-webcomponents/shortcuts.js index ab8eeb330a..bb33f49045 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/shortcuts.js +++ b/dashboard-ui/bower_components/emby-webcomponents/shortcuts.js @@ -209,6 +209,12 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'embyRouter', 'g }); } + function sendToast(text) { + require(['toast'], function (toast) { + toast(text); + }); + } + function executeAction(card, target, action) { target = target || card; @@ -257,6 +263,22 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'embyRouter', 'g }); } + else if (action === 'queue') { + + if (playbackManager.isPlaying()) { + playbackManager.queue({ + ids: [playableItemId], + serverId: serverId + }); + sendToast(globalize.translate('sharedcomponents#MediaQueued')); + } else { + playbackManager.queue({ + ids: [playableItemId], + serverId: serverId + }); + } + } + else if (action === 'playallfromhere') { playAllFromHere(card, serverId); } diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json b/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json index 3d1e180dc1..7a0f665bda 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json +++ b/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json @@ -377,5 +377,6 @@ "SyncJobItemStatusRemovedFromDevice": "Removed from device", "SyncJobItemStatusCancelled": "Cancelled", "Retry": "Retry", - "HeaderMyDevice": "My Device" + "HeaderMyDevice": "My Device", + "MediaQueued": "Media queued." } \ No newline at end of file diff --git a/dashboard-ui/livetvsettings.html b/dashboard-ui/livetvsettings.html index ced5e5bf5b..2efda87792 100644 --- a/dashboard-ui/livetvsettings.html +++ b/dashboard-ui/livetvsettings.html @@ -51,10 +51,6 @@ -