From b8c3e8c777694d3fb7df534d3a48d32013535391 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 13 Apr 2014 14:25:22 -0400
Subject: [PATCH] fixes for chrome 35

---
 dashboard-ui/css/mediaplayer-video.css    | 35 ++++++++++++-----------
 dashboard-ui/scripts/mediaplayer-video.js |  6 ++--
 dashboard-ui/scripts/mediaplayer.js       |  3 +-
 dashboard-ui/scripts/site.js              |  1 -
 4 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/dashboard-ui/css/mediaplayer-video.css b/dashboard-ui/css/mediaplayer-video.css
index 8ad83120f..2244f255c 100644
--- a/dashboard-ui/css/mediaplayer-video.css
+++ b/dashboard-ui/css/mediaplayer-video.css
@@ -26,15 +26,15 @@
 
 .itemVideo {
     background-color: #000;
-    margin: 20px 20px 80px;
+    margin: 5px 5px 75px;
     width: 320px;
     height: 181px;
 }
 
 #videoControls {
     z-index: 99999;
-    padding: 0 20px 5px;
-    height: 80px;
+    padding: 0 5px 5px;
+    height: 75px;
     position: absolute;
     top: auto;
     right: 0;
@@ -54,7 +54,7 @@
 
     #videoControls #video-basic-controls {
         position: absolute;
-        top: 30px;
+        top: 25px;
         left: 20px;
         bottom: 0;
         width: 600px;
@@ -63,7 +63,7 @@
 
     #videoControls #video-advanced-controls {
         position: absolute;
-        top: 30px;
+        top: 25px;
         right: 20px;
         bottom: 0;
         width: 400px;
@@ -142,6 +142,11 @@
     bottom: 85px;
 }
 
+#mediaPlayer .volumeSliderContainer {
+    position: relative;
+    top: 5px;
+}
+
 /* Media queries
     ***************************************/
 
@@ -191,10 +196,6 @@
         margin-left: -550px;
         margin-top: -329px;
     }
-
-    #video-videoPlayerMenuButton {
-        display: none;
-    }
 }
 
 @media all and (min-width: 1440px) and (min-height: 720px) {
@@ -245,10 +246,6 @@
         width: 250px;
     }
 
-        #mediaPlayer #video-basic-controls .volumeSliderContainer {
-            margin-top: 8px;
-        }
-
     #mediaPlayer #video-basic-controls, #mediaPlayer #video-advanced-controls {
         width: 200px;
         height: 120px;
@@ -269,14 +266,18 @@
     }
 }
 
-@media all and (max-width: 500px) {
-    #mediaPlayer .previousTrackButton, #mediaPlayer .nextTrackButton {
+@media all and (max-width: 600px) {
+    #mediaPlayer .volumeSliderContainer, #mediaPlayer .muteButton, #mediaPlayer .unmuteButton {
+        display: none!important;
+    }
+
+    #mediaPlayer .nowPlayingImage, #mediaPlayer .nowPlayingText {
         display: none!important;
     }
 }
 
-@media all and (max-width: 400px) {
-    #mediaPlayer .playlistButton {
+@media all and (max-width: 500px) {
+    #mediaPlayer .previousTrackButton, #mediaPlayer .nextTrackButton {
         display: none!important;
     }
 }
diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index bb2610dc3..31df97680 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -32,6 +32,7 @@
 
         self.initVideoPlayer = function () {
             video = playVideo(item, mediaSource, startPosition, user);
+
             return video;
         };
 
@@ -861,9 +862,9 @@
 
             // Can't autoplay in these browsers so we need to use the full controls
             if (requiresControls) {
-                html += '<video class="itemVideo" id="itemVideo" autoplay controls preload="none">';
+                html += '<video class="itemVideo" id="itemVideo" autoplay controls>';
             } else {
-                html += '<video class="itemVideo" id="itemVideo" autoplay preload="none">';
+                html += '<video class="itemVideo" id="itemVideo" autoplay>';
             }
 
             if (!isStatic) {
@@ -890,7 +891,6 @@
             $('#video-stopButton', videoControls).show();
             $('#video-playButton', videoControls).hide();
             $('#video-pauseButton', videoControls).show();
-            $('#video-playlistButton', videoControls).hide();
             $('#video-previousTrackButton', videoControls).hide();
             $('#video-nextTrackButton', videoControls).hide();
             var videoElement = $('#videoElement', mediaPlayer).prepend(html);
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 5a7e18620..0d4bf7ef5 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -726,6 +726,7 @@
         };
 
         self.pause = function () {
+
             currentMediaElement.pause();
         };
 
@@ -1138,7 +1139,7 @@
                 html += '<div class="mediaPlayerAudioContainer" style="display:none;"><div class="mediaPlayerAudioContainerInner">';;
             }
 
-            html += '<audio class="mediaPlayerAudio" preload="auto" controls>';
+            html += '<audio class="mediaPlayerAudio" controls>';
             html += '</audio></div></div>';
 
             $(document.body).append(html);
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index db2c48af5..ad5eaffea 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1309,7 +1309,6 @@ $(function () {
 
     videoPlayerHtml += '<div id="video-basic-controls">';
 
-    videoPlayerHtml += '<a id="video-playlistButton" class="mediaButton playlistButton" href="playlist.videoPlayerHtml" data-role="button" data-icon="bullets" data-iconpos="notext" data-inline="true" title="Playlist">Playlist</a>';
     videoPlayerHtml += '<button id="video-previousTrackButton" class="mediaButton previousTrackButton" title="Previous Track" type="button" onclick="MediaPlayer.previousTrack();" data-icon="previous-track" data-iconpos="notext" data-inline="true">Previous Track</button>';
     videoPlayerHtml += '<button id="video-playButton" class="mediaButton" title="Play" type="button" onclick="MediaPlayer.unpause();" data-icon="play" data-iconpos="notext" data-inline="true">Play</button>';
     videoPlayerHtml += '<button id="video-pauseButton" class="mediaButton" title="Pause" type="button" onclick="MediaPlayer.pause();" data-icon="pause" data-iconpos="notext" data-inline="true">Pause</button>';