asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #15420 from eska014/html5-internal-calls

Browse source 
Fix internal Emscripten JS API calls
This commit is contained in:
Rémi Verschelde 2018-01-07 00:11:58 +01:00 committed by GitHub
commit 00d5b9ce96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
misc/dist/html/default.html vendored
View file

@ -350,7 +350,7 @@ $GODOT_HEAD_INCLUDE
}; };
function printError(text) { function printError(text) {
if (!text.startsWith('**ERROR**: ')) { if (!String.prototype.trim.call(text).startsWith('**ERROR**: ')) {
text = '**ERROR**: ' + text; text = '**ERROR**: ' + text;
} }
print(text); print(text);

2
platform/javascript/javascript_main.cpp
View file

@ -65,7 +65,7 @@ int main(int argc, char *argv[]) {
FS.mkdir('/userfs'); FS.mkdir('/userfs');
FS.mount(IDBFS, {}, '/userfs'); FS.mount(IDBFS, {}, '/userfs');
FS.syncfs(true, function(err) { FS.syncfs(true, function(err) {
Module['ccall']('main_after_fs_sync', null, ['string'], [err ? err.message : ""]) ccall('main_after_fs_sync', null, ['string'], [err ? err.message : ""])
}); });
); );
/* clang-format on */ /* clang-format on */

6
platform/javascript/os_javascript.cpp
View file

@ -566,7 +566,7 @@ void OS_JavaScript::set_css_cursor(const char *p_cursor) {
/* clang-format off */ /* clang-format off */
EM_ASM_({ EM_ASM_({
Module.canvas.style.cursor = Module.UTF8ToString($0); Module.canvas.style.cursor = UTF8ToString($0);
}, p_cursor); }, p_cursor);
/* clang-format on */ /* clang-format on */
} }
@ -576,7 +576,7 @@ const char *OS_JavaScript::get_css_cursor() const {
char cursor[16]; char cursor[16];
/* clang-format off */ /* clang-format off */
EM_ASM_INT({ EM_ASM_INT({
Module.stringToUTF8(Module.canvas.style.cursor ? Module.canvas.style.cursor : 'auto', $0, 16); stringToUTF8(Module.canvas.style.cursor ? Module.canvas.style.cursor : 'auto', $0, 16);
}, cursor); }, cursor);
/* clang-format on */ /* clang-format on */
return cursor; return cursor;
@ -792,7 +792,7 @@ void OS_JavaScript::main_loop_begin() {
/* clang-format off */ /* clang-format off */
EM_ASM_ARGS({ EM_ASM_ARGS({
const send_notification = Module.cwrap('send_notification', null, ['number']); const send_notification = cwrap('send_notification', null, ['number']);
const notifs = arguments; const notifs = arguments;
(['mouseover', 'mouseleave', 'focus', 'blur']).forEach(function(event, i) { (['mouseover', 'mouseleave', 'focus', 'blur']).forEach(function(event, i) {
Module.canvas.addEventListener(event, send_notification.bind(null, notifs[i])); Module.canvas.addEventListener(event, send_notification.bind(null, notifs[i]));