Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/lib/libhtml5.js
Original file line number Diff line number Diff line change
Expand Up @@ -202,16 +202,19 @@ var LibraryHTML5 = {
},

removeSingleHandler(eventHandler) {
for (var [i, handler] of JSEvents.eventHandlers.entries()) {
let success = false;
for (let i = 0; i < JSEvents.eventHandlers.length; ++i) {
const handler = JSEvents.eventHandlers[i];
if (handler.target === eventHandler.target
&& handler.eventTypeId === eventHandler.eventTypeId
&& handler.callbackfunc === eventHandler.callbackfunc
&& handler.userData === eventHandler.userData) {
JSEvents._removeHandler(i);
return {{{ cDefs.EMSCRIPTEN_RESULT_SUCCESS }}};
// in some very rare cases (ex: Safari / fullscreen events), there is more than 1 handler (eventTypeString is different)
JSEvents._removeHandler(i--);
success = true;
}
}
return {{{ cDefs.EMSCRIPTEN_RESULT_INVALID_PARAM }}};
return success ? {{{ cDefs.EMSCRIPTEN_RESULT_SUCCESS }}} : {{{ cDefs.EMSCRIPTEN_RESULT_INVALID_PARAM }}};
},

#if PTHREADS
Expand Down
4 changes: 2 additions & 2 deletions test/codesize/test_codesize_hello_dylink_all.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"a.out.js": 245720,
"a.out.js": 245732,
"a.out.nodebug.wasm": 574007,
"total": 819727,
"total": 819739,
"sent": [
"IMG_Init",
"IMG_Load",
Expand Down