Skip to content

Commit d7892a9

Browse files
authored
Use ES6 mulit-line template literals in JS libraries. NFC (#17464)
1 parent 9c127fe commit d7892a9

File tree

2 files changed

+42
-39
lines changed

2 files changed

+42
-39
lines changed

src/library_browser.js

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,23 @@ var LibraryBrowser = {
1313
'$warnOnce',
1414
'emscripten_set_main_loop_timing',
1515
],
16-
$Browser__postset: 'Module["requestFullscreen"] = function Module_requestFullscreen(lockPointer, resizeCanvas) { Browser.requestFullscreen(lockPointer, resizeCanvas) };\n' + // exports
16+
$Browser__postset: `
17+
// exports
18+
Module["requestFullscreen"] = function Module_requestFullscreen(lockPointer, resizeCanvas) { Browser.requestFullscreen(lockPointer, resizeCanvas) };
1719
#if ASSERTIONS
18-
'Module["requestFullScreen"] = function Module_requestFullScreen() { Browser.requestFullScreen() };\n' +
20+
Module["requestFullScreen"] = function Module_requestFullScreen() { Browser.requestFullScreen() };
1921
#endif
20-
'Module["requestAnimationFrame"] = function Module_requestAnimationFrame(func) { Browser.requestAnimationFrame(func) };\n' +
21-
'Module["setCanvasSize"] = function Module_setCanvasSize(width, height, noUpdates) { Browser.setCanvasSize(width, height, noUpdates) };\n' +
22-
'Module["pauseMainLoop"] = function Module_pauseMainLoop() { Browser.mainLoop.pause() };\n' +
23-
'Module["resumeMainLoop"] = function Module_resumeMainLoop() { Browser.mainLoop.resume() };\n' +
24-
'Module["getUserMedia"] = function Module_getUserMedia() { Browser.getUserMedia() };\n' +
25-
'Module["createContext"] = function Module_createContext(canvas, useWebGL, setInModule, webGLContextAttributes) { return Browser.createContext(canvas, useWebGL, setInModule, webGLContextAttributes) };\n' +
22+
Module["requestAnimationFrame"] = function Module_requestAnimationFrame(func) { Browser.requestAnimationFrame(func) };
23+
Module["setCanvasSize"] = function Module_setCanvasSize(width, height, noUpdates) { Browser.setCanvasSize(width, height, noUpdates) };
24+
Module["pauseMainLoop"] = function Module_pauseMainLoop() { Browser.mainLoop.pause() };
25+
Module["resumeMainLoop"] = function Module_resumeMainLoop() { Browser.mainLoop.resume() };
26+
Module["getUserMedia"] = function Module_getUserMedia() { Browser.getUserMedia() };
27+
Module["createContext"] = function Module_createContext(canvas, useWebGL, setInModule, webGLContextAttributes) { return Browser.createContext(canvas, useWebGL, setInModule, webGLContextAttributes) };
2628
#if MAIN_MODULE
27-
'var preloadedWasm = {};\n' +
29+
var preloadedWasm = {};
2830
#endif
29-
'var preloadedImages = {};\n' +
30-
'var preloadedAudios = {};\n',
31+
var preloadedImages = {};
32+
var preloadedAudios = {};`,
3133

3234
$Browser: {
3335
mainLoop: {

src/library_eventloop.js

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -34,34 +34,35 @@ LibraryJSEventLoop = {
3434
},
3535

3636
$polyfillSetImmediate__deps: ['$setImmediateWrapped', '$clearImmediateWrapped'],
37-
$polyfillSetImmediate__postset:
38-
'var emSetImmediate;\n' +
39-
'var emClearImmediate;\n' +
40-
'if (typeof setImmediate != "undefined") {\n' +
41-
'emSetImmediate = setImmediateWrapped;\n' +
42-
'emClearImmediate = clearImmediateWrapped;\n' +
43-
'} else if (typeof addEventListener == "function") {\n' +
44-
'var __setImmediate_id_counter = 0;\n' +
45-
'var __setImmediate_queue = [];\n' +
46-
'var __setImmediate_message_id = "_si";\n' +
47-
'/** @param {Event} e */\n' +
48-
'var __setImmediate_cb = (e) => {\n' +
49-
'if (e.data === __setImmediate_message_id) {\n' +
50-
'e.stopPropagation();\n' +
51-
'__setImmediate_queue.shift()();\n' +
52-
'++__setImmediate_id_counter;\n' +
53-
'}\n' +
54-
'}\n' +
55-
'addEventListener("message", __setImmediate_cb, true);\n' +
56-
'emSetImmediate = (func) => {\n' +
57-
'postMessage(__setImmediate_message_id, "*");\n' +
58-
'return __setImmediate_id_counter + __setImmediate_queue.push(func) - 1;\n' +
59-
'}\n' +
60-
'emClearImmediate = /**@type{function(number=)}*/((id) => {\n' +
61-
'var index = id - __setImmediate_id_counter;\n' +
62-
'if (index >= 0 && index < __setImmediate_queue.length) __setImmediate_queue[index] = function() {};\n' + // must preserve the order and count of elements in the queue, so replace the pending callback with an empty function
63-
'})\n' +
64-
'}',
37+
$polyfillSetImmediate__postset: `
38+
var emSetImmediate;
39+
var emClearImmediate;
40+
if (typeof setImmediate != "undefined") {
41+
emSetImmediate = setImmediateWrapped;
42+
emClearImmediate = clearImmediateWrapped;
43+
} else if (typeof addEventListener == "function") {
44+
var __setImmediate_id_counter = 0;
45+
var __setImmediate_queue = [];
46+
var __setImmediate_message_id = "_si";
47+
/** @param {Event} e */
48+
var __setImmediate_cb = (e) => {
49+
if (e.data === __setImmediate_message_id) {
50+
e.stopPropagation();
51+
__setImmediate_queue.shift()();
52+
++__setImmediate_id_counter;
53+
}
54+
}
55+
addEventListener("message", __setImmediate_cb, true);
56+
emSetImmediate = (func) => {
57+
postMessage(__setImmediate_message_id, "*");
58+
return __setImmediate_id_counter + __setImmediate_queue.push(func) - 1;
59+
}
60+
emClearImmediate = /**@type{function(number=)}*/((id) => {
61+
var index = id - __setImmediate_id_counter;
62+
// must preserve the order and count of elements in the queue, so replace the pending callback with an empty function
63+
if (index >= 0 && index < __setImmediate_queue.length) __setImmediate_queue[index] = () => {};
64+
})
65+
}`,
6566

6667
$polyfillSetImmediate: function() {
6768
// nop, used for its postset to ensure setImmediate() polyfill is

0 commit comments

Comments
 (0)