guacamole-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vn...@apache.org
Subject [13/14] incubator-guacamole-client git commit: GUACAMOLE-346: Remove "paused" notification. Correct UI behavior.
Date Wed, 19 Jul 2017 18:37:18 GMT
GUACAMOLE-346: Remove "paused" notification. Correct UI behavior.

Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/929452e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/929452e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/929452e7

Branch: refs/heads/master
Commit: 929452e7015896efb20ec77f2250279db02747df
Parents: 387302d
Author: Michael Jumper <mjumper@apache.org>
Authored: Sat Jul 15 17:45:39 2017 -0700
Committer: Michael Jumper <mjumper@apache.org>
Committed: Sat Jul 15 17:45:39 2017 -0700

----------------------------------------------------------------------
 doc/guacamole-playback-example/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(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/929452e7/doc/guacamole-playback-example/src/main/webapp/index.html
----------------------------------------------------------------------
diff --git a/doc/guacamole-playback-example/src/main/webapp/index.html b/doc/guacamole-playback-example/src/main/webapp/index.html
index 127e198..c5ff621 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 @@
     <body>
 
         <!-- Guacamole recording player -->
-        <div id="player" class="paused">
+        <div id="player">
 
             <!-- Player display -->
             <div id="display">
@@ -39,9 +39,6 @@
                             <button id="cancel-seek">Cancel</button>
                         </p>
                     </div>
-                    <div class="paused-notification">
-                        <p>Paused.</p>
-                    </div>
                 </div>
             </div>
 

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/929452e7/doc/guacamole-playback-example/src/main/webapp/playback.css
----------------------------------------------------------------------
diff --git a/doc/guacamole-playback-example/src/main/webapp/playback.css b/doc/guacamole-playback-example/src/main/webapp/playback.css
index 85bf904..bda4d3a 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;

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/929452e7/doc/guacamole-playback-example/src/main/webapp/playback.js
----------------------------------------------------------------------
diff --git a/doc/guacamole-playback-example/src/main/webapp/playback.js b/doc/guacamole-playback-example/src/main/webapp/playback.js
index 50ac0a4..6fb4c0b 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';


Mime
View raw message