update to latest js api client

2 files changed, 19 insertions, 11 deletions

diff --git a/MediaBrowser.WebDashboard/Html/scripts/DashboardPage.js b/MediaBrowser.WebDashboard/Html/scripts/DashboardPage.js
index 5b0685147..47ff3b0c1 100644
--- a/MediaBrowser.WebDashboard/Html/scripts/DashboardPage.js
+++ b/MediaBrowser.WebDashboard/Html/scripts/DashboardPage.js
@@ -114,31 +114,37 @@
 
     getClientType: function (connection) {
 
-        if (connection.Client.toLowerCase() == "dashboard") {
+        var clientLowered = connection.Client.toLowerCase();
+        
+        if (clientLowered == "dashboard") {
 
             return "<img src='css/images/clients/html5.png' alt='Dashboard' title='Dashboard' />";
         }
-        if (connection.Client.toLowerCase() == "mediabrowsertheater") {
+        if (clientLowered == "media browser classic") {
+
+            return "<img src='css/images/clients/mb.png' alt='Media Browser Classic' title='Media Browser Classic' />";
+        }
+        if (clientLowered == "media browser theater") {
 
             return "<img src='css/images/clients/mb.png' alt='Media Browser Theater' title='Media Browser Theater' />";
         }
-        if (connection.Client.toLowerCase() == "android") {
+        if (clientLowered == "android") {
 
             return "<img src='css/images/clients/android.png' alt='Android' title='Android' />";
         }
-        if (connection.Client.toLowerCase() == "ios") {
+        if (clientLowered == "ios") {
 
             return "<img src='css/images/clients/ios.png' alt='iOS' title='iOS' />";
         }
-        if (connection.Client.toLowerCase() == "windowsrt") {
+        if (clientLowered == "windows rt") {
 
             return "<img src='css/images/clients/windowsrt.png' alt='Windows RT' title='Windows RT' />";
         }
-        if (connection.Client.toLowerCase() == "windowsphone") {
+        if (clientLowered == "windows phone") {
 
             return "<img src='css/images/clients/windowsphone.png' alt='Windows Phone' title='Windows Phone' />";
         }
-        if (connection.Client.toLowerCase() == "dlna") {
+        if (clientLowered == "dlna") {
 
             return "<img src='css/images/clients/dlna.png' alt='Dlna' title='Dlna' />";
         }
diff --git a/MediaBrowser.WebDashboard/Html/scripts/site.js b/MediaBrowser.WebDashboard/Html/scripts/site.js
index 47f0c8508..27dc97810 100644
--- a/MediaBrowser.WebDashboard/Html/scripts/site.js
+++ b/MediaBrowser.WebDashboard/Html/scripts/site.js
@@ -81,14 +81,14 @@ var Dashboard = {
 

     setCurrentUser: function (userId) {

         localStorage.setItem("userId", userId);

-        ApiClient.currentUserId = userId;

+        ApiClient.currentUserId(userId);

         Dashboard.getUserPromise = null;

     },

 

     logout: function () {

         localStorage.removeItem("userId");

         Dashboard.getUserPromise = null;

-        ApiClient.currentUserId = null;

+        ApiClient.currentUserId(null);

         window.location = "login.html";

     },

 

@@ -857,7 +857,7 @@ var Dashboard = {
 

         systemInfo = systemInfo || Dashboard.lastSystemInfo;

 

-        var url = "ws://" + ApiClient.serverHostName + ":" + systemInfo.WebSocketPortNumber + "/mediabrowser";

+        var url = "ws://" + ApiClient.serverHostName() + ":" + systemInfo.WebSocketPortNumber + "/mediabrowser";

 

         var ws = new WebSocket(url);

 

@@ -1171,6 +1171,8 @@ var Dashboard = {
 

 };

 

+var ApiClient = MediaBrowser.ApiClient.create("Dashboard");

+

 $(function () {

 

     var footerHtml = '<div id="footer" class="ui-bar-a">';

@@ -1211,7 +1213,7 @@ $(document).on('pagebeforeshow', ".page", function () {
     var page = $(this);

     

     var userId = Dashboard.getCurrentUserId();

-    ApiClient.currentUserId = userId;

+    ApiClient.currentUserId(userId);

 

     if (!userId) {