milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into currenttime-is-ms

Browse source
This commit is contained in:
Ian Walton 2020-08-19 18:23:26 -04:00 • committed by GitHub
commit 69293aa7c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
115 changed files with 2733 additions and 3352 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/playback/queue/index.html
View file

@ -71,7 +71,7 @@
<span class="material-icons audiotrack"></span>
</button>
<button is="paper-icon-button-light" class="btnSubtitles videoButton btnPlayStateCommand autoSize" title="${ButtonSubtitles}" data-command="GoToSearch">
<button is="paper-icon-button-light" class="btnSubtitles videoButton btnPlayStateCommand autoSize" title="${Subtitles}" data-command="GoToSearch">
<span class="material-icons closed_caption"></span>
</button>
@ -129,7 +129,7 @@
</div>
<br />
<div>
<button is="paper-icon-button-light" class="btnGoHome btnCommand autoSize" title="${ButtonHome}" data-command="GoHome">
<button is="paper-icon-button-light" class="btnGoHome btnCommand autoSize" title="${Home}" data-command="GoHome">
<span class="material-icons home"></span>
</button>
<button is="paper-icon-button-light" class="btnShowSearch btnCommand autoSize" title="${Search}" data-command="GoToSearch">

8
src/controllers/playback/video/index.js
View file

@ -767,7 +767,7 @@ import 'css!assets/css/videoosd';
if (isPaused) {
btnPlayPauseIcon.classList.add('play_arrow');
btnPlayPause.setAttribute('title', globalize.translate('ButtonPlay') + ' (k)');
btnPlayPause.setAttribute('title', globalize.translate('Play') + ' (k)');
} else {
btnPlayPauseIcon.classList.add('pause');
btnPlayPause.setAttribute('title', globalize.translate('ButtonPause') + ' (k)');
@ -1243,6 +1243,12 @@ import 'css!assets/css/videoosd';
}
break;
}
case '>':
playbackManager.increasePlaybackRate(currentPlayer);
break;
case '<':
playbackManager.decreasePlaybackRate(currentPlayer);
break;
}
}