Merge pull request #665 from Arnavion/exitfullscreen

Fixed calls to document.exitFullscreen()
MediaCrush · Jan 5, 2015 · c44ca71 · c44ca71
2 parents 7d13c5d + d489bd4
commit c44ca71
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/scripts/players.coffee b/scripts/players.coffee
@@ -1,9 +1,11 @@
 subtitleRenderers = {}
 
-document.cancelFullScreen = document.cancelFullScreen ||
+document.exitFullscreen = document.exitFullscreen ||
+                   document.cancelFullScreen ||
                    document.mozCancelFullScreen ||
+                   document.webkitExitFullscreen ||
                    document.webkitCancelFullScreen ||
-                   document.msExitFullscreen # Thanks for that last one, Microsoft, well done
+                   document.msExitFullscreen
 
 MediaPlayer = (container) ->
     media = container.querySelector('video, audio')
@@ -229,7 +231,7 @@ MediaPlayer = (container) ->
             isFullscreen = false
             container.classList.remove('fullscreen')
             fullscreen.classList.remove('disabled')
-            document.cancelFullScreen()
+            document.exitFullscreen()
             # Chrome hack to fix positioning when leaving full screen
             _ = document.querySelector('.media')
             _.style.right = 0 if _

diff --git a/static/album.js b/static/album.js