Publishing latest changes

zomaish · Aug 26, 2014 · d36d1d3 · d36d1d3
1 parent 1d20718
commit d36d1d3
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 11 deletions.
diff --git a/advanced/application.js b/advanced/application.js
@@ -134,7 +134,8 @@ Application.prototype.onClick_ = function() {
 Application.prototype.onFullscreenClick_ = function() {
   if (this.fullscreen) {
     // The video is currently in fullscreen mode
-    var cancelFullscreen = document.exitFullScreen ||
+    var cancelFullscreen = document.exitFullscreen ||
+        document.exitFullScreen ||
         document.webkitCancelFullScreen ||
         document.mozCancelFullScreen;
     if (cancelFullscreen) {
@@ -144,7 +145,10 @@ Application.prototype.onFullscreenClick_ = function() {
     }
   } else {
     // Try to enter fullscreen mode in the browser
-    var requestFullscreen = document.documentElement.requestFullScreen ||
+    var requestFullscreen = document.documentElement.requestFullscreen ||
+        document.documentElement.webkitRequestFullscreen ||
+        document.documentElement.mozRequestFullscreen ||
+        document.documentElement.requestFullScreen ||
         document.documentElement.webkitRequestFullScreen ||
         document.documentElement.mozRequestFullScreen;
     if (requestFullscreen) {

diff --git a/advanced/index.html b/advanced/index.html
@@ -54,8 +54,8 @@
       </video>
       <div id="adcontainer">
       </div>
-      <button id="playpause">&#9654;</button>
-      <button id="fullscreen">[&nbsp;&nbsp;]</button>
+      <button id="playpause" title="Play/Pause">&#9654;</button>
+      <button id="fullscreen" title="Full screen">[&nbsp;&nbsp;&nbsp;]</button>
     </div>
 
     <!-- Declare a div where you want the companion to appear. Use

diff --git a/advanced/style.css b/advanced/style.css
@@ -68,7 +68,7 @@ footer {
 #fullscreen {
   position: absolute;
   bottom: 20px;
-  right: 20px;
+  left: 140px;
   height: 40px;
   width: 100px;
   border-style: none;

diff --git a/playlist/application.js b/playlist/application.js
@@ -145,7 +145,8 @@ Application.prototype.switchButtonToPlay_ = function() {
 Application.prototype.onFullscreenClick_ = function() {
   if (this.fullscreen) {
     // The video is currently in fullscreen mode
-    var cancelFullscreen = document.exitFullScreen ||
+    var cancelFullscreen = document.exitFullscreen ||
+        document.exitFullScreen ||
         document.webkitCancelFullScreen ||
         document.mozCancelFullScreen;
     if (cancelFullscreen) {
@@ -155,7 +156,10 @@ Application.prototype.onFullscreenClick_ = function() {
     }
   } else {
     // Try to enter fullscreen mode in the browser
-    var requestFullscreen = document.documentElement.requestFullScreen ||
+    var requestFullscreen = document.documentElement.requestFullscreen ||
+        document.documentElement.webkitRequestFullscreen ||
+        document.documentElement.mozRequestFullscreen ||
+        document.documentElement.requestFullScreen ||
         document.documentElement.webkitRequestFullScreen ||
         document.documentElement.mozRequestFullScreen;
     if (requestFullscreen) {

diff --git a/playlist/index.html b/playlist/index.html
@@ -49,9 +49,9 @@
       </video>
       <div id="adcontainer">
       </div>
-      <button id="playpause">&#9654;</button>
-      <button id="replay">&#8634;</button>
-      <button id="fullscreen">[&nbsp;&nbsp;]</button>
+      <button id="playpause" title="Play/Pause">&#9654;</button>
+      <button id="replay" title="Replay">&#8634;</button>
+      <button id="fullscreen" title="Full screen">[&nbsp;&nbsp;&nbsp;]</button>
     </div>
 
     <!-- Declare a div where you want the companion to appear. Use

diff --git a/playlist/style.css b/playlist/style.css
@@ -72,7 +72,7 @@ footer {
 #fullscreen {
   position: absolute;
   bottom: 20px;
-  right: 20px;
+  left: 140px;
   height: 40px;
   width: 100px;
   border-style: none;