1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

Merge branch 'master' into currenttime-is-ms

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

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;
}
}