fixing merge issue

dashboard-ui/scripts/mediaplayer.js

@@ -71,11 +71,13 @@
         var imageTags = item.ImageTags || {};
         var html = '';
 
+        var url = "";
+        
         if (item.BackdropImageTags && item.BackdropImageTags.length) {
 
             url = ApiClient.getImageUrl(item.Id, {
                 type: "Backdrop",
-                height: 30,
+                height: 36,
                 tag: item.BackdropImageTags[0]
             });
         }
@@ -83,7 +85,7 @@
 
             url = ApiClient.getImageUrl(item.Id, {
                 type: "Thumb",
-                height: 30,
+                height: 36,
                 tag: item.ImageTags.Thumb
             });
         }
@@ -91,7 +93,7 @@
 
             url = ApiClient.getImageUrl(item.Id, {
                 type: "Primary",
-                height: 30,
+                height: 36,
                 tag: item.ImageTags.Primary
             });
         }else {
@@ -111,7 +113,7 @@
             series_name = item.SeriesName || item.Album || item.ProductionYear;
         }
 
-        html += "<div><img class='clientNowPlayingImage' alt='' title='' src='" + url + "' style='height:30px;display:inline-block;' /></div>";
+        html += "<div><img class='nowPlayingBarImage ' alt='' title='' src='" + url + "' style='height:36px;display:inline-block;' /></div>";
         html += '<div>'+name+'<br/>'+series_name+'</div>';
 
         $('#mediaInfo', nowPlayingBar).html(html);

dashboard-ui/scripts/site.js

@@ -897,8 +897,10 @@ var Dashboard = {
         $(ApiClient).on("websocketmessage", Dashboard.onWebSocketMessageReceived);
     },
 
-    onWebSocketMessageReceived: function (msg) {
+    onWebSocketMessageReceived: function (e, data) {
 
+        var msg = data;
+        
         if (msg.MessageType === "LibraryChanged") {
             Dashboard.processLibraryUpdateNotification(msg.Data);
         }
@@ -908,7 +910,7 @@ var Dashboard = {
         else if (msg.MessageType === "SystemInfo") {
             Dashboard.updateSystemInfo(msg.Data);
         }
-        else if (msg.MessageType === "HasPendingRestartChanged") {
+        else if (msg.MessageType === "RestartRequired") {
             Dashboard.updateSystemInfo(msg.Data);
         }
         else if (msg.MessageType === "UserUpdated") {
@@ -937,7 +939,7 @@ var Dashboard = {
             Dashboard.showPackageInstallNotification(msg.Data, "progress");
             Dashboard.refreshSystemInfoFromServer();
         }
-        else if (msg.MessageType === "ScheduledTaskEndExecute") {
+        else if (msg.MessageType === "ScheduledTaskEnded") {
 
             Dashboard.showTaskCompletionNotification(msg.Data);
         }
@@ -1092,7 +1094,7 @@ var Dashboard = {
                     type: "Primary"
                 });
 
-                if (!item.Id || data.icon.indexOf("undefined") != -1) {
+                if (!item.Id || !data.icon) {
                     alert("bad image url: " + JSON.stringify(item));
                     console.log("bad image url: " + JSON.stringify(item));