Skip to content

Commit 930165c

Browse files
committed
Remove references to mozRequestPointerLock and friends. NFC
The official `requestPointerLock` API is supported in all the browsers that we support. See https://developer.mozilla.org/en-US/docs/Web/API/Element/requestPointerLock
1 parent cc1de1a commit 930165c

File tree

2 files changed

+5
-24
lines changed

2 files changed

+5
-24
lines changed

src/lib/libbrowser.js

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -146,32 +146,16 @@ var LibraryBrowser = {
146146

147147
function pointerLockChange() {
148148
var canvas = Browser.getCanvas();
149-
Browser.pointerLock = document['pointerLockElement'] === canvas ||
150-
document['mozPointerLockElement'] === canvas ||
151-
document['webkitPointerLockElement'] === canvas ||
152-
document['msPointerLockElement'] === canvas;
149+
Browser.pointerLock = document.pointerLockElement === canvas;
153150
}
154151
var canvas = Browser.getCanvas();
155152
if (canvas) {
156153
// forced aspect ratio can be enabled by defining 'forcedAspectRatio' on Module
157154
// Module['forcedAspectRatio'] = 4 / 3;
158155

159-
canvas.requestPointerLock = canvas['requestPointerLock'] ||
160-
canvas['mozRequestPointerLock'] ||
161-
canvas['webkitRequestPointerLock'] ||
162-
canvas['msRequestPointerLock'] ||
163-
(() => {});
164-
canvas.exitPointerLock = document['exitPointerLock'] ||
165-
document['mozExitPointerLock'] ||
166-
document['webkitExitPointerLock'] ||
167-
document['msExitPointerLock'] ||
168-
(() => {}); // no-op if function does not exist
169-
canvas.exitPointerLock = canvas.exitPointerLock.bind(document);
156+
canvas.exitPointerLock = document.exitPointerLock.bind(document);
170157

171158
document.addEventListener('pointerlockchange', pointerLockChange, false);
172-
document.addEventListener('mozpointerlockchange', pointerLockChange, false);
173-
document.addEventListener('webkitpointerlockchange', pointerLockChange, false);
174-
document.addEventListener('mspointerlockchange', pointerLockChange, false);
175159

176160
if (Module['elementPointerLock']) {
177161
canvas.addEventListener("click", (ev) => {

src/lib/libhtml5.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1595,10 +1595,9 @@ var LibraryHTML5 = {
15951595
'$specialHTMLTargets'
15961596
#endif
15971597
],
1598-
emscripten_set_pointerlockchange_callback_on_thread__docs: '/** @suppress {missingProperties} */', // Closure does not see document.body.mozRequestPointerLock etc.
15991598
emscripten_set_pointerlockchange_callback_on_thread: (target, userData, useCapture, callbackfunc, targetThread) => {
16001599
// TODO: Currently not supported in pthreads or in --proxy-to-worker mode. (In pthreads mode, document object is not defined)
1601-
if (!document || !document.body || (!document.body.requestPointerLock && !document.body.mozRequestPointerLock && !document.body.webkitRequestPointerLock && !document.body.msRequestPointerLock)) {
1600+
if (!document || !document.body?.requestPointerLock) {
16021601
return {{{ cDefs.EMSCRIPTEN_RESULT_NOT_SUPPORTED }}};
16031602
}
16041603

@@ -1644,10 +1643,9 @@ var LibraryHTML5 = {
16441643
'$specialHTMLTargets'
16451644
#endif
16461645
],
1647-
emscripten_set_pointerlockerror_callback_on_thread__docs: '/** @suppress {missingProperties} */', // Closure does not see document.body.mozRequestPointerLock etc.
16481646
emscripten_set_pointerlockerror_callback_on_thread: (target, userData, useCapture, callbackfunc, targetThread) => {
16491647
// TODO: Currently not supported in pthreads or in --proxy-to-worker mode. (In pthreads mode, document object is not defined)
1650-
if (!document || !document.body.requestPointerLock && !document.body.mozRequestPointerLock && !document.body.webkitRequestPointerLock && !document.body.msRequestPointerLock) {
1648+
if (!document || !document.body?.requestPointerLock) {
16511649
return {{{ cDefs.EMSCRIPTEN_RESULT_NOT_SUPPORTED }}};
16521650
}
16531651

@@ -1666,10 +1664,9 @@ var LibraryHTML5 = {
16661664

16671665
emscripten_get_pointerlock_status__proxy: 'sync',
16681666
emscripten_get_pointerlock_status__deps: ['$fillPointerlockChangeEventData'],
1669-
emscripten_get_pointerlock_status__docs: '/** @suppress {missingProperties} */', // Closure does not see document.body.mozRequestPointerLock etc.
16701667
emscripten_get_pointerlock_status: (pointerlockStatus) => {
16711668
if (pointerlockStatus) fillPointerlockChangeEventData(pointerlockStatus);
1672-
if (!document.body || (!document.body.requestPointerLock && !document.body.mozRequestPointerLock && !document.body.webkitRequestPointerLock && !document.body.msRequestPointerLock)) {
1669+
if (!document || !document.body?.requestPointerLock) {
16731670
return {{{ cDefs.EMSCRIPTEN_RESULT_NOT_SUPPORTED }}};
16741671
}
16751672
return {{{ cDefs.EMSCRIPTEN_RESULT_SUCCESS }}};

0 commit comments

Comments
 (0)