From 7323e865f260f9795935ae4e93d2e49b06d6f658 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 17 Jul 2016 16:38:05 -0400
Subject: [PATCH] fix shuffle/instant mix

---
 dashboard-ui/scripts/mediacontroller.js | 11 +++++++++++
 dashboard-ui/scripts/site.js            |  3 +++
 2 files changed, 14 insertions(+)

diff --git a/dashboard-ui/scripts/mediacontroller.js b/dashboard-ui/scripts/mediacontroller.js
index 547cdc7771..a02cbc4910 100644
--- a/dashboard-ui/scripts/mediacontroller.js
+++ b/dashboard-ui/scripts/mediacontroller.js
@@ -585,12 +585,23 @@
 
         self.shuffle = function (id) {
 
+            // accept both id and item being passed in
+            if (id.Id) {
+                id = id.Id;
+            }
+
             doWithPlaybackValidation(currentPlayer, function () {
                 currentPlayer.shuffle(id);
             });
         };
 
         self.instantMix = function (id) {
+
+            // accept both id and item being passed in
+            if (id.Id) {
+                id = id.Id;
+            }
+
             doWithPlaybackValidation(currentPlayer, function () {
                 currentPlayer.instantMix(id);
             });
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index d30a20ad39..62ef9b2847 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -2039,6 +2039,9 @@ var AppInfo = {};
                 },
                 instantMix: function (item) {
                     return MediaController.instantMix(item);
+                },
+                shuffle: function (item) {
+                    return MediaController.shuffle(item);
                 }
             };
         });