merge branch master into itemdetailpage-layout

src/controllers/dashboardpage.js

@@ -623,7 +623,7 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
             }
         },
         getClientImage: function (connection) {
-            var iconUrl = imageHelper.getDeviceIcon(connection.DeviceName);
+            var iconUrl = imageHelper.getDeviceIcon(connection);
             return "<img src='" + iconUrl + "' />";
         },
         getNowPlayingImageUrl: function (item) {

src/controllers/devices.js

@@ -74,7 +74,7 @@ define(["loading", "dom", "libraryMenu", "globalize", "scripts/imagehelper", "hu
             deviceHtml += '<div class="cardScalable">';
             deviceHtml += '<div class="cardPadder cardPadder-backdrop"></div>';
             deviceHtml += '<a is="emby-linkbutton" href="' + (canEdit ? "device.html?id=" + device.Id : "#") + '" class="cardContent cardImageContainer">';
-            var iconUrl = imageHelper.getDeviceIcon(device.Name);
+            var iconUrl = imageHelper.getDeviceIcon(device);
 
             if (iconUrl) {
                 deviceHtml += '<div class="cardImage" style="background-image:url(\'' + iconUrl + "');background-size: auto 64%;background-position:center center;\">";

src/controllers/itemdetailpage.js

@@ -1271,7 +1271,7 @@ define(["loading", "appRouter", "layoutManager", "userSettings", "connectionMana
                     coverImage: "MusicAlbum" == item.Type || "MusicArtist" == item.Type,
                     overlayPlayButton: true,
                     overlayText: false,
-                    showYear: "Movie" === item.Type || "Trailer" === item.Type
+                    showYear: "Movie" === item.Type || "Trailer" === item.Type || "Series" === item.Type
                 });
                 var similarContent = similarCollapsible.querySelector(".similarContent");
                 similarContent.innerHTML = html;
@@ -1737,6 +1737,7 @@ define(["loading", "appRouter", "layoutManager", "userSettings", "connectionMana
             items: items,
             shape: shape,
             showTitle: true,
+            showYear: "Video" === type.mediaType || "Series" === type.type,
             centerText: true,
             lazy: true,
             showDetailsMenu: true,

src/controllers/loginpage.js

@@ -92,7 +92,7 @@ define(["apphost", "appSettings", "dom", "connectionManager", "loading", "layout
                 html += '<div class="cardImageContainer coveredImage coveredImage-noScale" style="background-image:url(\'' + imgUrl + "');\"></div>";
             } else {
                 var background = getMetroColor(user.Id);
-                imgUrl = "img/logindefault.png";
+                imgUrl = "assets/img/avatar.png";
                 html += '<div class="cardImageContainer coveredImage coveredImage-noScale" style="background-image:url(\'' + imgUrl + "');background-color:" + background + ';"></div>';
             }
             html += "</div>";

src/controllers/music/musicalbums.js

@@ -241,6 +241,9 @@ define(["layoutManager", "playbackManager", "loading", "events", "libraryBrowser
                     }, {
                         name: Globalize.translate("OptionReleaseDate"),
                         id: "ProductionYear,PremiereDate,SortName"
+                    }, {
+                        name: Globalize.translate("OptionRandom"),
+                        id: "Random,SortName"
                     }],
                     callback: function () {
                         getQuery().StartIndex = 0;

src/controllers/user/profile.js

@@ -8,7 +8,7 @@ define(["controllers/userpasswordpage", "loading", "libraryMenu", "apphost", "em
             page.querySelector(".username").innerHTML = user.Name;
             libraryMenu.setTitle(user.Name);
 
-            var imageUrl = "img/logindefault.png";
+            var imageUrl = "assets/img/avatar.png";
             if (user.PrimaryImageTag) {
                 imageUrl = ApiClient.getUserImageUrl(user.Id, {
                     tag: user.PrimaryImageTag,

src/controllers/videoosd.js

@@ -1,4 +1,4 @@
-define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "mediaInfo", "focusManager", "imageLoader", "scrollHelper", "events", "connectionManager", "browser", "globalize", "apphost", "layoutManager", "userSettings", "scrollStyles", "emby-slider", "paper-icon-button-light", "css!css/videoosd"], function (playbackManager, dom, inputManager, datetime, itemHelper, mediaInfo, focusManager, imageLoader, scrollHelper, events, connectionManager, browser, globalize, appHost, layoutManager, userSettings) {
+define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "mediaInfo", "focusManager", "imageLoader", "scrollHelper", "events", "connectionManager", "browser", "globalize", "apphost", "layoutManager", "userSettings", "scrollStyles", "emby-slider", "paper-icon-button-light", "css!assets/css/videoosd"], function (playbackManager, dom, inputManager, datetime, itemHelper, mediaInfo, focusManager, imageLoader, scrollHelper, events, connectionManager, browser, globalize, appHost, layoutManager, userSettings) {
     "use strict";
 
     function seriesImageUrl(item, options) {
@@ -402,6 +402,8 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
 
         function onHideAnimationComplete(e) {
             var elem = e.target;
+            if (elem != osdBottomElement)
+                return;
             elem.classList.add("hide");
             dom.removeEventListener(elem, transitionEndEventName, onHideAnimationComplete, {
                 once: true