synchronize sound/video when exit fullscreen

1641ccf2 · Xiaowu Zhang · 43e728b3 · 1641ccf2 · 1641ccf2
Commit 1641ccf2 authored Jul 22, 2014 by Xiaowu Zhang
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

dev/audioplayer_control/control.js dev/audioplayer_control/control.js +2 -1

src/audioplayer_control/control.js src/audioplayer_control/control.js +2 -1

No files found.
--- a/dev/audioplayer_control/control.js
+++ b/dev/audioplayer_control/control.js
@@ -264,13 +264,14 @@
                if (isFullScreen) {
                    cancelFullScreen();
                    g.audio.currentTime = g.video.currentTime;
+                    g.video.currentTime = g.audio.currentTime;
                } else {
                    requestFullScreen();
                }
            }), loopEventListener(video, "play", false, function(event) {
-                g.audio.play();
                if (g.video.currentTime) {
                    g.audio.currentTime = g.video.currentTime;
+                    g.audio.play();
                    g.video.currentTime = g.audio.currentTime;
                }
                command_context.innerHTML = "stop";

--- a/src/audioplayer_control/control.js
+++ b/src/audioplayer_control/control.js
@@ -358,15 +358,16 @@
              if (isFullScreen) {
                cancelFullScreen();
                g.audio.currentTime = g.video.currentTime;
+                g.video.currentTime = g.audio.currentTime;
              } else {
                requestFullScreen();
              }
            }),

            loopEventListener(video, "play", false, function (event) {
-              g.audio.play();
              if (g.video.currentTime) {
                g.audio.currentTime = g.video.currentTime;
+                g.audio.play();
                g.video.currentTime = g.audio.currentTime;//consistency
              }
              command_context.innerHTML = "stop";