From 929452e7015896efb20ec77f2250279db02747df Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sat, 15 Jul 2017 17:45:39 -0700 Subject: [PATCH] GUACAMOLE-346: Remove "paused" notification. Correct UI behavior. --- .../src/main/webapp/index.html | 5 +---- .../src/main/webapp/playback.css | 6 ------ .../src/main/webapp/playback.js | 10 +++++++--- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/doc/guacamole-playback-example/src/main/webapp/index.html b/doc/guacamole-playback-example/src/main/webapp/index.html index 127e1985c..c5ff62123 100644 --- a/doc/guacamole-playback-example/src/main/webapp/index.html +++ b/doc/guacamole-playback-example/src/main/webapp/index.html @@ -28,7 +28,7 @@ -
+
@@ -39,9 +39,6 @@

-
-

Paused.

-
diff --git a/doc/guacamole-playback-example/src/main/webapp/playback.css b/doc/guacamole-playback-example/src/main/webapp/playback.css index 85bf90445..bda4d3a99 100644 --- a/doc/guacamole-playback-example/src/main/webapp/playback.css +++ b/doc/guacamole-playback-example/src/main/webapp/playback.css @@ -34,7 +34,6 @@ bottom: 0; } -#player .paused-notification, #player .seek-notification { color: white; @@ -50,11 +49,6 @@ display: table; } -#player.paused .paused-notification { - display: table; -} - -#player .paused-notification p, #player .seek-notification p { display: table-cell; text-align: center; diff --git a/doc/guacamole-playback-example/src/main/webapp/playback.js b/doc/guacamole-playback-example/src/main/webapp/playback.js index 50ac0a4ca..6fb4c0ba8 100644 --- a/doc/guacamole-playback-example/src/main/webapp/playback.js +++ b/doc/guacamole-playback-example/src/main/webapp/playback.js @@ -162,13 +162,11 @@ // If playing, the play/pause button should read "Pause" recording.onplay = function() { playPause.textContent = 'Pause'; - player.className = 'playing'; }; // If paused, the play/pause button should read "Play" recording.onpause = function() { playPause.textContent = 'Play'; - player.className = 'paused'; }; // Toggle play/pause when display or button are clicked @@ -182,6 +180,7 @@ // Resume playback when cancel button is clicked cancelSeek.onclick = function cancelSeekOperation(e) { recording.play(); + player.className = ''; e.stopPropagation(); }; @@ -213,7 +212,12 @@ positionSlider.onchange = function sliderPositionChanged() { // Request seek - recording.seek(positionSlider.value); + recording.seek(positionSlider.value, function seekComplete() { + + // Seek has completed + player.className = ''; + + }); // Seek is in progress player.className = 'seeking';