safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-1873: Merge fix for automatic hide behavior of recording player control bar.

Browse Source
This commit is contained in:
Mike Jumper
2023-10-24 16:51:09 -07:00
committed by GitHub
parent 557a62a16b 2312eefe28
commit db950a1779
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
guacamole/src/main/frontend/src/app/player/templates/player.html
View File

@@ -3,7 +3,11 @@
ng-click="togglePlayback()"></guac-player-display> ng-click="togglePlayback()"></guac-player-display>
<!-- Player controls --> <!-- Player controls -->
<div class="guac-player-controls" ng-show="recording"> <div class="guac-player-controls" ng-show="recording"
ng-class="{
'paused' : !recording.isPlaying(),
'playing' : recording.isPlaying()
}">
<!-- Playback position slider --> <!-- Playback position slider -->
<input class="guac-player-seek" type="range" min="0" step="1" <input class="guac-player-seek" type="range" min="0" step="1"

6
guacamole/src/main/frontend/src/app/settings/styles/history-player.css
View File

@@ -96,7 +96,7 @@
background: rgba(0, 0, 0, 0.5); background: rgba(0, 0, 0, 0.5);
} }
.settings.connectionHistoryPlayer.playing .guac-player-controls { .settings.connectionHistoryPlayer .guac-player-controls.playing {
opacity: 0; opacity: 0;
-webkit-transition: opacity 0.25s linear 0.25s; -webkit-transition: opacity 0.25s linear 0.25s;
-moz-transition: opacity 0.25s linear 0.25s; -moz-transition: opacity 0.25s linear 0.25s;
@@ -104,8 +104,8 @@
transition: opacity 0.25s linear 0.25s; transition: opacity 0.25s linear 0.25s;
} }
.settings.connectionHistoryPlayer.paused .guac-player-controls, .settings.connectionHistoryPlayer .guac-player-controls.paused,
.settings.connectionHistoryPlayer.playing:hover .guac-player-controls { .settings.connectionHistoryPlayer .guac-player-controls.playing:hover {
opacity: 1; opacity: 1;
-webkit-transition-delay: 0s; -webkit-transition-delay: 0s;
-moz-transition-delay: 0s; -moz-transition-delay: 0s;

7
guacamole/src/main/frontend/src/app/settings/templates/settingsConnectionHistoryPlayer.html
View File

@@ -1,9 +1,4 @@
<guac-viewport class="settings view connectionHistoryPlayer" <guac-viewport class="settings view connectionHistoryPlayer">
ng-class="{
'no-recording' : !selectedRecording,
'paused' : !playing,
'playing' : playing
}">
<!-- Player for selected recording --> <!-- Player for selected recording -->
<guac-player src="tunnel"></guac-player> <guac-player src="tunnel"></guac-player>