Skip to content

Commit 10d156e

Browse files
authored
Remove old setWindowTitle global function (#20160)
Instead just move the single implementation to `emscripten_set_window_title` alongside `emscripten_get_window_title`.
1 parent 973a38c commit 10d156e

9 files changed

+14
-17
lines changed

src/library_browser.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1120,9 +1120,7 @@ var LibraryBrowser = {
11201120
},
11211121

11221122
emscripten_set_window_title__proxy: 'sync',
1123-
emscripten_set_window_title: (title) => {
1124-
setWindowTitle(UTF8ToString(title));
1125-
},
1123+
emscripten_set_window_title: (title) => document.title = UTF8ToString(title),
11261124

11271125
emscripten_get_screen_size__proxy: 'sync',
11281126
emscripten_get_screen_size: (width, height) => {

src/library_glfw.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ var LibraryGLFW = {
8383

8484
$GLFW__deps: ['emscripten_get_now', '$GL', '$Browser', '$GLFW_Window',
8585
'$stringToNewUTF8',
86+
'emscripten_set_window_title',
8687
#if FILESYSTEM
8788
'$FS',
8889
#endif
@@ -636,9 +637,9 @@ var LibraryGLFW = {
636637
var win = GLFW.WindowFromId(winid);
637638
if (!win) return;
638639

639-
win.title = UTF8ToString(title);
640+
win.title = title;
640641
if (GLFW.active.id == win.id) {
641-
document.title = win.title;
642+
_emscripten_set_window_title(title);
642643
}
643644
},
644645

src/library_sdl.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1723,9 +1723,10 @@ var LibrarySDL = {
17231723
#endif
17241724

17251725
SDL_WM_SetCaption__proxy: 'sync',
1726+
SDL_WM_SetCaption__deps: ['emscripten_set_window_title'],
17261727
SDL_WM_SetCaption: (title, icon) => {
1727-
if (title && typeof setWindowTitle != 'undefined') {
1728-
setWindowTitle(UTF8ToString(title));
1728+
if (title) {
1729+
_emscripten_set_window_title(title);
17291730
}
17301731
icon = icon && UTF8ToString(icon);
17311732
},

src/shell.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,7 @@ function locateFile(path) {
172172
// Hooks that are implemented differently in different runtime environments.
173173
var read_,
174174
readAsync,
175-
readBinary,
176-
setWindowTitle;
175+
readBinary;
177176

178177
#if ENVIRONMENT_MAY_BE_NODE
179178
if (ENVIRONMENT_IS_NODE) {
@@ -407,8 +406,6 @@ if (ENVIRONMENT_IS_WEB || ENVIRONMENT_IS_WORKER) {
407406
{
408407
#include "web_or_worker_shell_read.js"
409408
}
410-
411-
setWindowTitle = (title) => document.title = title;
412409
} else
413410
#endif // ENVIRONMENT_MAY_BE_WEB || ENVIRONMENT_MAY_BE_WORKER
414411
#if AUDIO_WORKLET && ASSERTIONS
@@ -475,7 +472,7 @@ assert(typeof Module['filePackagePrefixURL'] == 'undefined', 'Module.filePackage
475472
assert(typeof Module['read'] == 'undefined', 'Module.read option was removed (modify read_ in JS)');
476473
assert(typeof Module['readAsync'] == 'undefined', 'Module.readAsync option was removed (modify readAsync in JS)');
477474
assert(typeof Module['readBinary'] == 'undefined', 'Module.readBinary option was removed (modify readBinary in JS)');
478-
assert(typeof Module['setWindowTitle'] == 'undefined', 'Module.setWindowTitle option was removed (modify setWindowTitle in JS)');
475+
assert(typeof Module['setWindowTitle'] == 'undefined', 'Module.setWindowTitle option was removed (modify emscripten_set_window_title in JS)');
479476
assert(typeof Module['TOTAL_MEMORY'] == 'undefined', 'Module.TOTAL_MEMORY has been renamed Module.INITIAL_MEMORY');
480477
{{{ makeRemovedModuleAPIAssert('asm', 'wasmExports', false) }}}
481478
{{{ makeRemovedModuleAPIAssert('read', 'read_') }}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
23567
1+
23580
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20039
1+
20052
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
58331
1+
58269
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
31712
1+
31637
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
57045
1+
56983

0 commit comments

Comments
 (0)