From dc1da009b3806163f57632b1b6164d848d55d205 Mon Sep 17 00:00:00 2001
From: Tim Hobbs <jesus.tesh@gmail.com>
Date: Wed, 4 Jun 2014 15:58:12 -0700
Subject: [PATCH] Fix for playlist page

Conflicts:
	MediaBrowser.WebDashboard/dashboard-ui/scripts/mediacontroller.js
---
 dashboard-ui/scripts/mediacontroller.js | 4 ++++
 dashboard-ui/scripts/playlist.js        | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dashboard-ui/scripts/mediacontroller.js b/dashboard-ui/scripts/mediacontroller.js
index ca99256785..745f75b5a6 100644
--- a/dashboard-ui/scripts/mediacontroller.js
+++ b/dashboard-ui/scripts/mediacontroller.js
@@ -291,6 +291,10 @@
             currentPlayer.shuffle(id);
         };
 
+        self.playlist = function() {
+            return currentPlayer.playlist || [];
+        };
+
         self.sendCommand = function (cmd, player) {
 
             player = player || self.getLocalPlayer();
diff --git a/dashboard-ui/scripts/playlist.js b/dashboard-ui/scripts/playlist.js
index d6ea060d61..66cd9f4143 100644
--- a/dashboard-ui/scripts/playlist.js
+++ b/dashboard-ui/scripts/playlist.js
@@ -17,7 +17,7 @@
 
         html += '<tbody>';
 
-        $.each(MediaController.playlist, function (i, item) {
+        $.each(MediaController.playlist(), function (i, item) {
 
             var name = LibraryBrowser.getPosterViewDisplayName(item);
 
@@ -80,7 +80,7 @@
 
         var page = this;
 
-        //reloadPlaylist(page);
+        reloadPlaylist(page);
     });