From ed0f918ac6c677be5cba02a6990afb6eb4b620e9 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 24 May 2013 10:35:15 -0400
Subject: [PATCH] fixes for mobile playback

---
 dashboard-ui/library.html                |  2 ++
 dashboard-ui/scripts/medialibrarypage.js |  4 ++--
 dashboard-ui/scripts/mediaplayer.js      | 25 ++++++++++++------------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/dashboard-ui/library.html b/dashboard-ui/library.html
index 361fddfb6..2d87a75fe 100644
--- a/dashboard-ui/library.html
+++ b/dashboard-ui/library.html
@@ -31,6 +31,8 @@
                         <div id="divVirtualFolders"></div>
                     </div>
                 </div>
+                <br />
+                <div>Define images for collections by <a href="index.html">browsing and editing.</a></div>
             </div>
         </div>
         <div data-role="popup" id="popupEnterText" class="ui-corner-all popup">
diff --git a/dashboard-ui/scripts/medialibrarypage.js b/dashboard-ui/scripts/medialibrarypage.js
index 86c9be5d6..aff97dcaa 100644
--- a/dashboard-ui/scripts/medialibrarypage.js
+++ b/dashboard-ui/scripts/medialibrarypage.js
@@ -103,8 +103,8 @@
         html += '</ul>';
 
         html += '<p>';
-        html += '<button type="button" data-inline="true" data-icon="minus" data-folderindex="' + index + '" onclick="MediaLibraryPage.deleteVirtualFolder(this);">Remove collection</button>';
-        html += '<button type="button" data-inline="true" data-icon="pencil" data-folderindex="' + index + '" onclick="MediaLibraryPage.renameVirtualFolder(this);">Rename collection</button>';
+        html += '<button type="button" data-inline="true" data-icon="minus" data-folderindex="' + index + '" onclick="MediaLibraryPage.deleteVirtualFolder(this);" data-mini="true">Remove collection</button>';
+        html += '<button type="button" data-inline="true" data-icon="pencil" data-folderindex="' + index + '" onclick="MediaLibraryPage.renameVirtualFolder(this);" data-mini="true">Rename collection</button>';
         html += '</p>';
 
         html += '</div>';
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index e4b3ba3f6..ea3656896 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -35,13 +35,13 @@
                 }
             }
         }
-        
+
         function isFullScreen() {
             return document.fullscreenEnabled || document.mozFullscreenEnabled || document.webkitIsFullScreen ? true : false;
         }
-        
-        $(document).on('webkitfullscreenchange mozfullscreenchange fullscreenchange', function() {
-            
+
+        $(document).on('webkitfullscreenchange mozfullscreenchange fullscreenchange', function () {
+
             if (isFullScreen()) {
                 $('.itemVideo').addClass('fullscreenVideo');
             } else {
@@ -285,7 +285,12 @@
 
             var html = '';
 
-            html += '<audio preload="auto" autoplay>';
+            // Can't autoplay in these browsers so we need to use the full controls
+            if ($.browser.msie || $.browser.android || $.browser.iphone || $.browser.ipad) {
+                html += '<audio preload="auto" autoplay controls>';
+            } else {
+                html += '<audio preload="auto" style="display:none;" autoplay>';
+            }
             html += '<source type="audio/mpeg" src="' + mp3Url + '" />';
             html += '<source type="audio/aac" src="' + aacUrl + '" />';
             html += '<source type="audio/webm" src="' + webmUrl + '" />';
@@ -328,7 +333,7 @@
 
                 currentTimeElement.show();
 
-                audioElement.removeAttr('controls').hide().off("play.once");
+                audioElement.off("play.once");
 
                 ApiClient.reportPlaybackStart(Dashboard.getCurrentUserId(), item.Id);
 
@@ -454,8 +459,8 @@
             // HLS must be at the top for safari
             // Webm must be ahead of mp4 due to the issue of mp4 playing too fast in chrome
 
-            // Can't autoplay in ie so need to use the full controls
-            if ($.browser.msie) {
+            // Can't autoplay in these browsers so we need to use the full controls
+            if ($.browser.msie || $.browser.android || $.browser.iphone || $.browser.ipad) {
                 html += '<video class="itemVideo" preload="auto" autoplay controls>';
             } else {
                 html += '<video class="itemVideo" preload="auto" autoplay>';
@@ -552,10 +557,6 @@
 
         self.canPlayMediaType = function (mediaType) {
 
-            if ($.browser.android || $.browser.iphone || $.browser.ipad) {
-                return false;
-            }
-
             var media;
 
             if (mediaType === "Video") {