From 9ba1961a0c4f22aca3b3804e33e07adc12287af0 Mon Sep 17 00:00:00 2001 From: Claus Vium Date: Mon, 11 Mar 2019 08:24:26 +0100 Subject: [PATCH 1/2] Sort item results in the same order as requested --- .../emby-webcomponents/playback/playbackmanager.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/bower_components/emby-webcomponents/playback/playbackmanager.js b/src/bower_components/emby-webcomponents/playback/playbackmanager.js index 59a7ffd8bb..c506334a18 100644 --- a/src/bower_components/emby-webcomponents/playback/playbackmanager.js +++ b/src/bower_components/emby-webcomponents/playback/playbackmanager.js @@ -1806,6 +1806,12 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla } function translateItemsForPlayback(items, options) { + if (items.length > 1) { + // Use the original request id array for sorting the result in the proper order + items.sort(function (a, b) { + return options.ids.indexOf(a.Id) - options.ids.indexOf(b.Id); + }); + } var firstItem = items[0]; var promise; From 5ce13990b67f31f8e22c7db4ef6fd7a6f32ea833 Mon Sep 17 00:00:00 2001 From: Claus Vium Date: Mon, 11 Mar 2019 08:30:36 +0100 Subject: [PATCH 2/2] Add some extra null handling just in case --- .../emby-webcomponents/playback/playbackmanager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bower_components/emby-webcomponents/playback/playbackmanager.js b/src/bower_components/emby-webcomponents/playback/playbackmanager.js index c506334a18..b0904c4e96 100644 --- a/src/bower_components/emby-webcomponents/playback/playbackmanager.js +++ b/src/bower_components/emby-webcomponents/playback/playbackmanager.js @@ -1806,7 +1806,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla } function translateItemsForPlayback(items, options) { - if (items.length > 1) { + if (items.length > 1 && options && options.ids) { // Use the original request id array for sorting the result in the proper order items.sort(function (a, b) { return options.ids.indexOf(a.Id) - options.ids.indexOf(b.Id);