@@ -1543,7 +1543,7 @@ var LibraryHTML5 = {
1543
1543
1544
1544
$fillPointerlockChangeEventData__deps : [ '$JSEvents' , '$stringToUTF8' ] ,
1545
1545
$fillPointerlockChangeEventData : ( eventStruct ) => {
1546
- var pointerLockElement = document . pointerLockElement || document . mozPointerLockElement || document . webkitPointerLockElement || document . msPointerLockElement ;
1546
+ var pointerLockElement = document . pointerLockElement ;
1547
1547
var isPointerlocked = ! ! pointerLockElement ;
1548
1548
#if ! SAFE_HEAP
1549
1549
// Assigning a boolean to HEAP32 with expected type coercion.
@@ -1595,10 +1595,9 @@ var LibraryHTML5 = {
1595
1595
'$specialHTMLTargets'
1596
1596
#endif
1597
1597
] ,
1598
- emscripten_set_pointerlockchange_callback_on_thread__docs : '/ ** @suppress { missingProperties } * / ' , / / Closure does not see document . body . mozRequestPointerLock etc .
1599
1598
emscripten_set_pointerlockchange_callback_on_thread : ( target , userData , useCapture , callbackfunc , targetThread ) = > {
1600
1599
// 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 ) {
1602
1601
return { { { cDefs . EMSCRIPTEN_RESULT_NOT_SUPPORTED } } } ;
1603
1602
}
1604
1603
@@ -1608,9 +1607,6 @@ var LibraryHTML5 = {
1608
1607
target = target ? findEventTarget ( target ) : specialHTMLTargets [ { { { cDefs . EMSCRIPTEN_EVENT_TARGET_DOCUMENT } } } ] ; // Pointer lock change events need to be captured from 'document' by default instead of 'window'
1609
1608
#endif
1610
1609
if ( ! target ) return { { { cDefs . EMSCRIPTEN_RESULT_UNKNOWN_TARGET } } } ;
1611
- registerPointerlockChangeEventCallback ( target , userData, useCapture, callbackfunc, { { { cDefs . EMSCRIPTEN_EVENT_POINTERLOCKCHANGE } } } , "mozpointerlockchange" , targetThread ) ;
1612
- registerPointerlockChangeEventCallback( target , userData, useCapture, callbackfunc, { { { cDefs . EMSCRIPTEN_EVENT_POINTERLOCKCHANGE } } } , "webkitpointerlockchange" , targetThread ) ;
1613
- registerPointerlockChangeEventCallback( target , userData, useCapture, callbackfunc, { { { cDefs . EMSCRIPTEN_EVENT_POINTERLOCKCHANGE } } } , "mspointerlockchange" , targetThread ) ;
1614
1610
return registerPointerlockChangeEventCallback ( target , userData, useCapture, callbackfunc, { { { cDefs . EMSCRIPTEN_EVENT_POINTERLOCKCHANGE } } } , "pointerlockchange" , targetThread) ;
1615
1611
} ,
1616
1612
@@ -1644,10 +1640,9 @@ var LibraryHTML5 = {
1644
1640
'$specialHTMLTargets'
1645
1641
#endif
1646
1642
] ,
1647
- emscripten_set_pointerlockerror_callback_on_thread__docs : '/** @suppress {missingProperties} */' , // Closure does not see document.body.mozRequestPointerLock etc.
1648
1643
emscripten_set_pointerlockerror_callback_on_thread : ( target , userData , useCapture , callbackfunc , targetThread ) => {
1649
1644
// 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 ) {
1645
+ if ( ! document || ! document . body ? .requestPointerLock ) {
1651
1646
return { { { cDefs . EMSCRIPTEN_RESULT_NOT_SUPPORTED } } } ;
1652
1647
}
1653
1648
@@ -1658,18 +1653,14 @@ var LibraryHTML5 = {
1658
1653
#endif
1659
1654
1660
1655
if ( ! target ) return { { { cDefs . EMSCRIPTEN_RESULT_UNKNOWN_TARGET } } } ;
1661
- registerPointerlockErrorEventCallback ( target , userData , useCapture , callbackfunc , { { { cDefs . EMSCRIPTEN_EVENT_POINTERLOCKERROR } } } , "mozpointerlockerror ", targetThread ) ;
1662
- registerPointerlockErrorEventCallback ( target , userData , useCapture , callbackfunc , { { { cDefs . EMSCRIPTEN_EVENT_POINTERLOCKERROR } } } , "webkitpointerlockerror ", targetThread ) ;
1663
- registerPointerlockErrorEventCallback ( target , userData , useCapture , callbackfunc , { { { cDefs . EMSCRIPTEN_EVENT_POINTERLOCKERROR } } } , "mspointerlockerror ", targetThread ) ;
1664
1656
return registerPointerlockErrorEventCallback ( target , userData , useCapture , callbackfunc , { { { cDefs . EMSCRIPTEN_EVENT_POINTERLOCKERROR } } } , "pointerlockerror ", targetThread ) ;
1665
1657
} ,
1666
1658
1667
1659
emscripten_get_pointerlock_status__proxy : 'sync ',
1668
1660
emscripten_get_pointerlock_status__deps : [ '$fillPointerlockChangeEventData '] ,
1669
- emscripten_get_pointerlock_status__docs : '/ ** @suppress { missingProperties } * / ', // Closure does not see document.body.mozRequestPointerLock etc.
1670
1661
emscripten_get_pointerlock_status : ( pointerlockStatus ) => {
1671
1662
if ( pointerlockStatus ) fillPointerlockChangeEventData ( pointerlockStatus ) ;
1672
- if ( ! document . body || ( ! document . body . requestPointerLock && ! document . body . mozRequestPointerLock && ! document . body . webkitRequestPointerLock && ! document . body . msRequestPointerLock ) ) {
1663
+ if ( ! document || ! document . body ? .requestPointerLock ) {
1673
1664
return { { { cDefs . EMSCRIPTEN_RESULT_NOT_SUPPORTED } } } ;
1674
1665
}
1675
1666
return { { { cDefs . EMSCRIPTEN_RESULT_SUCCESS } } } ;
0 commit comments