web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2025-03-29 22:07:10 +02:00
Code Releases Activity

fix: exit full window mode with Esc key (#7224)

Browse Source
This commit is contained in:
FredTsang 2021-05-12 00:54:15 +08:00 committed by GitHub
parent 0e46624f1a
commit e9953e59fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/js/player.js
View File

@ -2979,9 +2979,11 @@ class Player extends Component {
fullWindowOnEscKey(event) {
if (keycode.isEventKey(event, 'Esc')) {
if (this.isFullscreen() === true) {
this.exitFullscreen();
} else {
this.exitFullWindow();
if (!this.isFullWindow) {
this.exitFullscreen();
} else {
this.exitFullWindow();
}
}
}
}

17
test/unit/player-fullscreen.test.js
View File

@ -207,3 +207,20 @@ QUnit.test('fullscreenOptions from function args should override player options'
player.dispose();
});
QUnit.test('fullwindow mode should exit when ESC event triggered', function(assert) {
const player = FullscreenTestHelpers.makePlayer(true);
player.enterFullWindow();
assert.ok(player.isFullWindow, 'enterFullWindow should be called');
const evt = TestHelpers.createEvent('keydown');
evt.keyCode = 27;
evt.which = 27;
player.boundFullWindowOnEscKey_(evt);
// player.fullWindowOnEscKey(evt);
assert.equal(player.isFullWindow, false, 'exitFullWindow should be called');
player.dispose();
});