From 86a26eb07b9674dcdc5ff27c6120d78b59badf48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 6 Nov 2020 20:16:36 +0100 Subject: [PATCH] Platform: don't hardcode status and log element IDs for Emscripten. I still need to figure out how to not hardcode a global Module, heh. --- src/Magnum/Platform/EmscriptenApplication.js | 11 ++++++----- .../Platform/WindowlessEmscriptenApplication.js | 14 ++++++++------ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/Magnum/Platform/EmscriptenApplication.js b/src/Magnum/Platform/EmscriptenApplication.js index 2ec89ceb0..4e77f9b0a 100644 --- a/src/Magnum/Platform/EmscriptenApplication.js +++ b/src/Magnum/Platform/EmscriptenApplication.js @@ -47,18 +47,19 @@ var Module = { }, canvas: document.getElementById('canvas'), + status: document.getElementById('status'), + statusDescription: document.getElementById('status-description'), setStatus: function(message) { - var status = document.getElementById('status'); /* Emscripten calls setStatus("") after a timeout even if the app aborts. That would erase the crash message, so don't allow that */ - if(status && status.innerHTML != "Oops :(") - status.innerHTML = message; + if(Module.status && Module.status.innerHTML != "Oops :(") + Module.status.innerHTML = message; }, setStatusDescription: function(message) { - var statusDescription = document.getElementById('status-description'); - if(statusDescription) statusDescription.innerHTML = message; + if(Module.statusDescription) + Module.statusDescription.innerHTML = message; }, totalDependencies: 0, diff --git a/src/Magnum/Platform/WindowlessEmscriptenApplication.js b/src/Magnum/Platform/WindowlessEmscriptenApplication.js index bfe137392..9ef86a063 100644 --- a/src/Magnum/Platform/WindowlessEmscriptenApplication.js +++ b/src/Magnum/Platform/WindowlessEmscriptenApplication.js @@ -50,15 +50,17 @@ var Module = { /* onAbort not handled here, as the output is printed directly on the page */ canvas: document.getElementById('canvas'), + status: document.getElementById('status'), + statusDescription: document.getElementById('status-description'), + log: document.getElementById('log'), setStatus: function(message) { - var status = document.getElementById('status'); - if(status) status.innerHTML = message; + if(Module.status) Module.status.innerHTML = message; }, setStatusDescription: function(message) { - var statusDescription = document.getElementById('status-description'); - if(statusDescription) statusDescription.innerHTML = message; + if(Module.statusDescription) + Module.statusDescription.innerHTML = message; }, totalDependencies: 0, @@ -72,7 +74,7 @@ var Module = { } else { Module.setStatus('Download complete'); Module.setStatusDescription(''); - document.getElementById('log').style.display = 'block'; + Module.log.style.display = 'block'; } } }; @@ -92,4 +94,4 @@ for(var i = 0; i != args.length; ++i) { } Module.setStatus('Downloading...'); -document.getElementById('log').style.display = 'none'; +Module.log.style.display = 'none';