Skip to content

Commit 3a3f357

Browse files
authored
Prefix JSEvent_ function has JS-only library functions. NFC (#16905)
This avoids having to use the `_` prefix when calling them. It also prevents them polluting the native symbol address space.
1 parent 1a493a9 commit 3a3f357

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

src/library_html5.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1214,11 +1214,11 @@ var LibraryHTML5 = {
12141214
return {{{ cDefine('EMSCRIPTEN_RESULT_SUCCESS') }}};
12151215
},
12161216

1217-
JSEvents_requestFullscreen__deps: ['$JSEvents', 'JSEvents_resizeCanvasForFullscreen'],
1218-
JSEvents_requestFullscreen: function(target, strategy) {
1217+
$JSEvents_requestFullscreen__deps: ['$JSEvents', '$JSEvents_resizeCanvasForFullscreen'],
1218+
$JSEvents_requestFullscreen: function(target, strategy) {
12191219
// EMSCRIPTEN_FULLSCREEN_SCALE_DEFAULT + EMSCRIPTEN_FULLSCREEN_CANVAS_SCALE_NONE is a mode where no extra logic is performed to the DOM elements.
12201220
if (strategy.scaleMode != {{{ cDefine('EMSCRIPTEN_FULLSCREEN_SCALE_DEFAULT') }}} || strategy.canvasResolutionScaleMode != {{{ cDefine('EMSCRIPTEN_FULLSCREEN_CANVAS_SCALE_NONE') }}}) {
1221-
_JSEvents_resizeCanvasForFullscreen(target, strategy);
1221+
JSEvents_resizeCanvasForFullscreen(target, strategy);
12221222
}
12231223

12241224
if (target.requestFullscreen) {
@@ -1254,8 +1254,8 @@ var LibraryHTML5 = {
12541254
return {{{ cDefine('EMSCRIPTEN_RESULT_SUCCESS') }}};
12551255
},
12561256

1257-
JSEvents_resizeCanvasForFullscreen__deps: ['$registerRestoreOldStyle', '$getCanvasElementSize', '$setLetterbox', '$setCanvasElementSize', '$getBoundingClientRect'],
1258-
JSEvents_resizeCanvasForFullscreen: function(target, strategy) {
1257+
$JSEvents_resizeCanvasForFullscreen__deps: ['$registerRestoreOldStyle', '$getCanvasElementSize', '$setLetterbox', '$setCanvasElementSize', '$getBoundingClientRect'],
1258+
$JSEvents_resizeCanvasForFullscreen: function(target, strategy) {
12591259
var restoreOldStyle = registerRestoreOldStyle(target);
12601260
var cssWidth = strategy.softFullscreen ? innerWidth : screen.width;
12611261
var cssHeight = strategy.softFullscreen ? innerHeight : screen.height;
@@ -1533,7 +1533,7 @@ var LibraryHTML5 = {
15331533
},
15341534

15351535
// https://developer.mozilla.org/en-US/docs/Web/Guide/API/DOM/Using_full_screen_mode
1536-
$doRequestFullscreen__deps: ['$JSEvents', '$setLetterbox', 'emscripten_set_canvas_element_size', 'emscripten_get_canvas_element_size', '$getCanvasElementSize', '$setCanvasElementSize', 'JSEvents_requestFullscreen', '$findEventTarget'],
1536+
$doRequestFullscreen__deps: ['$JSEvents', '$setLetterbox', 'emscripten_set_canvas_element_size', 'emscripten_get_canvas_element_size', '$getCanvasElementSize', '$setCanvasElementSize', '$JSEvents_requestFullscreen', '$findEventTarget'],
15371537
$doRequestFullscreen: function(target, strategy) {
15381538
if (!JSEvents.fullscreenEnabled()) return {{{ cDefine('EMSCRIPTEN_RESULT_NOT_SUPPORTED') }}};
15391539
#if !DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR
@@ -1563,15 +1563,15 @@ var LibraryHTML5 = {
15631563
// Queue this function call if we're not currently in an event handler and the user saw it appropriate to do so.
15641564
if (!canPerformRequests) {
15651565
if (strategy.deferUntilInEventHandler) {
1566-
JSEvents.deferCall(_JSEvents_requestFullscreen, 1 /* priority over pointer lock */, [target, strategy]);
1566+
JSEvents.deferCall(JSEvents_requestFullscreen, 1 /* priority over pointer lock */, [target, strategy]);
15671567
return {{{ cDefine('EMSCRIPTEN_RESULT_DEFERRED') }}};
15681568
} else {
15691569
return {{{ cDefine('EMSCRIPTEN_RESULT_FAILED_NOT_DEFERRED') }}};
15701570
}
15711571
}
15721572
#endif
15731573

1574-
return _JSEvents_requestFullscreen(target, strategy);
1574+
return JSEvents_requestFullscreen(target, strategy);
15751575
},
15761576

15771577
emscripten_request_fullscreen__deps: ['$doRequestFullscreen'],
@@ -1612,7 +1612,7 @@ var LibraryHTML5 = {
16121612
return doRequestFullscreen(target, strategy);
16131613
},
16141614

1615-
emscripten_enter_soft_fullscreen__deps: ['$JSEvents', '$setLetterbox', '$hideEverythingExceptGivenElement', '$restoreOldWindowedStyle', '$registerRestoreOldStyle', '$restoreHiddenElements', '$currentFullscreenStrategy', '$softFullscreenResizeWebGLRenderTarget', '$getCanvasElementSize', '$setCanvasElementSize', 'JSEvents_resizeCanvasForFullscreen', '$findEventTarget'],
1615+
emscripten_enter_soft_fullscreen__deps: ['$JSEvents', '$setLetterbox', '$hideEverythingExceptGivenElement', '$restoreOldWindowedStyle', '$registerRestoreOldStyle', '$restoreHiddenElements', '$currentFullscreenStrategy', '$softFullscreenResizeWebGLRenderTarget', '$getCanvasElementSize', '$setCanvasElementSize', '$JSEvents_resizeCanvasForFullscreen', '$findEventTarget'],
16161616
emscripten_enter_soft_fullscreen__proxy: 'sync',
16171617
emscripten_enter_soft_fullscreen__sig: 'iii',
16181618
emscripten_enter_soft_fullscreen: function(target, fullscreenStrategy) {
@@ -1635,7 +1635,7 @@ var LibraryHTML5 = {
16351635
softFullscreen: true
16361636
};
16371637

1638-
var restoreOldStyle = _JSEvents_resizeCanvasForFullscreen(target, strategy);
1638+
var restoreOldStyle = JSEvents_resizeCanvasForFullscreen(target, strategy);
16391639

16401640
document.documentElement.style.overflow = 'hidden'; // Firefox, Chrome
16411641
document.body.scroll = "no"; // IE11
@@ -1682,14 +1682,14 @@ var LibraryHTML5 = {
16821682
return {{{ cDefine('EMSCRIPTEN_RESULT_SUCCESS') }}};
16831683
},
16841684

1685-
emscripten_exit_fullscreen__deps: ['$JSEvents', '$currentFullscreenStrategy', 'JSEvents_requestFullscreen', '$specialHTMLTargets'],
1685+
emscripten_exit_fullscreen__deps: ['$JSEvents', '$currentFullscreenStrategy', '$JSEvents_requestFullscreen', '$specialHTMLTargets'],
16861686
emscripten_exit_fullscreen__proxy: 'sync',
16871687
emscripten_exit_fullscreen__sig: 'i',
16881688
emscripten_exit_fullscreen: function() {
16891689
if (!JSEvents.fullscreenEnabled()) return {{{ cDefine('EMSCRIPTEN_RESULT_NOT_SUPPORTED') }}};
16901690
#if HTML5_SUPPORT_DEFERRING_USER_SENSITIVE_REQUESTS
16911691
// Make sure no queued up calls will fire after this.
1692-
JSEvents.removeDeferredCalls(_JSEvents_requestFullscreen);
1692+
JSEvents.removeDeferredCalls(JSEvents_requestFullscreen);
16931693
#endif
16941694

16951695
var d = specialHTMLTargets[{{{ cDefine('EMSCRIPTEN_EVENT_TARGET_DOCUMENT') }}}];

0 commit comments

Comments
 (0)