merge branch master into autoplay

src/scripts/browserdeviceprofile.js

@@ -77,10 +77,6 @@ define(['browser'], function (browser) {
             return true;
         }
 
-        if (browser.osx || browser.iOS) {
-            return false;
-        }
-
         return videoTestElement.canPlayType('audio/mp4; codecs="ac-3"').replace(/no/, '');
     }
 

src/scripts/inputManager.js

@@ -22,9 +22,7 @@ define(['playbackManager', 'focusManager', 'appRouter', 'dom'], function (playba
 
     var eventListenerCount = 0;
     function on(scope, fn) {
-        if (eventListenerCount) {
-            eventListenerCount++;
-        }
+        eventListenerCount++;
         dom.addEventListener(scope, 'command', fn, {});
     }
 

src/scripts/librarymenu.js

@@ -108,7 +108,9 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
             headerCastButton.addEventListener("click", onCastButtonClicked);
         }
 
-        initHeadRoom(skinHeader);
+        if (layoutManager.mobile) {
+            initHeadRoom(skinHeader);
+        }
     }
 
     function onCastButtonClicked() {
@@ -424,7 +426,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
         return getToolsMenuHtml(apiClient).then(function (toolsMenuHtml) {
             var html = "";
             html += '<a class="adminDrawerLogo clearLink" is="emby-linkbutton" href="home.html">';
-            html += '<img src="assets/img/logo.png" />';
+            html += '<img src="assets/img/icon-transparent.png" />';
             html += "</a>";
             html += toolsMenuHtml;
             navDrawerScrollContainer.innerHTML = html;