@@ -245,10 +245,9 @@ var LibraryHTML5 = {
245245#endif
246246
247247 getNodeNameForTarget ( target ) {
248- if ( ! target ) return '' ;
249248 if ( target == window ) return '#window' ;
250249 if ( target == screen ) return '#screen' ;
251- return target ?. nodeName || '' ;
250+ return target ?. nodeName ?? '' ;
252251 } ,
253252
254253 fullscreenEnabled ( ) {
@@ -297,10 +296,10 @@ var LibraryHTML5 = {
297296 HEAP32 [ idx + { { { C_STRUCTS . EmscriptenKeyboardEvent . charCode / 4 } } } ] = e . charCode ;
298297 HEAP32 [ idx + { { { C_STRUCTS . EmscriptenKeyboardEvent . keyCode / 4 } } } ] = e . keyCode ;
299298 HEAP32 [ idx + { { { C_STRUCTS . EmscriptenKeyboardEvent . which / 4 } } } ] = e . which ;
300- stringToUTF8 ( e . key || '' , keyEventData + { { { C_STRUCTS . EmscriptenKeyboardEvent . key } } } , { { { cDefs . EM_HTML5_SHORT_STRING_LEN_BYTES } } } ) ;
301- stringToUTF8 ( e . code || '' , keyEventData + { { { C_STRUCTS . EmscriptenKeyboardEvent . code } } } , { { { cDefs . EM_HTML5_SHORT_STRING_LEN_BYTES } } } ) ;
302- stringToUTF8 ( e . char || '' , keyEventData + { { { C_STRUCTS . EmscriptenKeyboardEvent . charValue } } } , { { { cDefs . EM_HTML5_SHORT_STRING_LEN_BYTES } } } ) ;
303- stringToUTF8 ( e . locale || '' , keyEventData + { { { C_STRUCTS . EmscriptenKeyboardEvent . locale } } } , { { { cDefs . EM_HTML5_SHORT_STRING_LEN_BYTES } } } ) ;
299+ stringToUTF8 ( e . key ?? '' , keyEventData + { { { C_STRUCTS . EmscriptenKeyboardEvent . key } } } , { { { cDefs . EM_HTML5_SHORT_STRING_LEN_BYTES } } } ) ;
300+ stringToUTF8 ( e . code ?? '' , keyEventData + { { { C_STRUCTS . EmscriptenKeyboardEvent . code } } } , { { { cDefs . EM_HTML5_SHORT_STRING_LEN_BYTES } } } ) ;
301+ stringToUTF8 ( e . char ?? '' , keyEventData + { { { C_STRUCTS . EmscriptenKeyboardEvent . charValue } } } , { { { cDefs . EM_HTML5_SHORT_STRING_LEN_BYTES } } } ) ;
302+ stringToUTF8 ( e . locale ?? '' , keyEventData + { { { C_STRUCTS . EmscriptenKeyboardEvent . locale } } } , { { { cDefs . EM_HTML5_SHORT_STRING_LEN_BYTES } } } ) ;
304303
305304#if PTHREADS
306305 if ( targetThread ) __emscripten_run_callback_on_thread ( targetThread , callbackfunc , eventTypeId , keyEventData , eventSize , userData ) ;
@@ -727,7 +726,7 @@ var LibraryHTML5 = {
727726
728727 var focusEventHandlerFunc = ( e ) => {
729728 var nodeName = JSEvents . getNodeNameForTarget ( e . target ) ;
730- var id = e . target . id ? e . target . id : '' ;
729+ var id = e . target . id ?? '' ;
731730
732731 var focusEvent = JSEvents . focusEvent ;
733732 stringToUTF8 ( nodeName , focusEvent + { { { C_STRUCTS . EmscriptenFocusEvent . nodeName } } } , { { { cDefs . EM_HTML5_LONG_STRING_LEN_BYTES } } } ) ;
@@ -1025,11 +1024,11 @@ var LibraryHTML5 = {
10251024 // If transitioning to windowed mode, report info about the element that just was fullscreen.
10261025 var reportedElement = isFullscreen ? fullscreenElement : JSEvents . previousFullscreenElement ;
10271026 var nodeName = JSEvents . getNodeNameForTarget ( reportedElement ) ;
1028- var id = reportedElement ?. id || '' ;
1027+ var id = reportedElement ?. id ?? '' ;
10291028 stringToUTF8 ( nodeName , eventStruct + { { { C_STRUCTS . EmscriptenFullscreenChangeEvent . nodeName } } } , { { { cDefs . EM_HTML5_LONG_STRING_LEN_BYTES } } } ) ;
10301029 stringToUTF8 ( id , eventStruct + { { { C_STRUCTS . EmscriptenFullscreenChangeEvent . id } } } , { { { cDefs . EM_HTML5_LONG_STRING_LEN_BYTES } } } ) ;
1031- { { { makeSetValue ( 'eventStruct' , C_STRUCTS . EmscriptenFullscreenChangeEvent . elementWidth , 'reportedElement ? reportedElement .clientWidth : 0' , 'i32' ) } } } ;
1032- { { { makeSetValue ( 'eventStruct' , C_STRUCTS . EmscriptenFullscreenChangeEvent . elementHeight , 'reportedElement ? reportedElement .clientHeight : 0' , 'i32' ) } } } ;
1030+ { { { makeSetValue ( 'eventStruct' , C_STRUCTS . EmscriptenFullscreenChangeEvent . elementWidth , 'reportedElement? .clientWidth ?? 0' , 'i32' ) } } } ;
1031+ { { { makeSetValue ( 'eventStruct' , C_STRUCTS . EmscriptenFullscreenChangeEvent . elementHeight , 'reportedElement? .clientHeight ?? 0' , 'i32' ) } } } ;
10331032 { { { makeSetValue ( 'eventStruct' , C_STRUCTS . EmscriptenFullscreenChangeEvent . screenWidth , 'screen.width' , 'i32' ) } } } ;
10341033 { { { makeSetValue ( 'eventStruct' , C_STRUCTS . EmscriptenFullscreenChangeEvent . screenHeight , 'screen.height' , 'i32' ) } } } ;
10351034 if ( isFullscreen ) {
@@ -1533,7 +1532,7 @@ var LibraryHTML5 = {
15331532 /** @suppress {checkTypes} */
15341533 { { { makeSetValue ( 'eventStruct' , C_STRUCTS . EmscriptenPointerlockChangeEvent . isActive , 'isPointerlocked' , 'i8' ) } } } ;
15351534 var nodeName = JSEvents . getNodeNameForTarget ( pointerLockElement ) ;
1536- var id = pointerLockElement ?. id || '' ;
1535+ var id = pointerLockElement ?. id ?? '' ;
15371536 stringToUTF8 ( nodeName , eventStruct + { { { C_STRUCTS . EmscriptenPointerlockChangeEvent . nodeName } } } , { { { cDefs . EM_HTML5_LONG_STRING_LEN_BYTES } } } ) ;
15381537 stringToUTF8 ( id , eventStruct + { { { C_STRUCTS . EmscriptenPointerlockChangeEvent . id } } } , { { { cDefs . EM_HTML5_LONG_STRING_LEN_BYTES } } } ) ;
15391538 } ,
0 commit comments