Merge pull request #6114 from RobLoach/patch-27

emscripten: Remove output textarea
This commit is contained in:
Twinaphex 2018-01-15 17:02:50 +01:00 committed by GitHub
commit d8a5958e21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -34,9 +34,6 @@
<input type="textbox" id="latency" size="3" maxlength="3" value="96"> <label for="latency" id="latency-label">Audio latency (ms) (increase if you hear pops at fullspeed, can only be done before loading game)</label> <input type="textbox" id="latency" size="3" maxlength="3" value="96"> <label for="latency" id="latency-label">Audio latency (ms) (increase if you hear pops at fullspeed, can only be done before loading game)</label>
</div> </div>
<hr/>
<textarea class="emscripten" id="output" rows="8"></textarea>
<hr>
<div class="emscripten" id="controls"> <div class="emscripten" id="controls">
Controls:<br> Controls:<br>
<br> <br>
@ -65,7 +62,7 @@
count = files.length; count = files.length;
document.getElementById("openrom").innerHTML = ''; document.getElementById("openrom").innerHTML = '';
document.getElementById("openrom").style.display = 'none'; document.getElementById("openrom").style.display = 'none';
for (var i = 0; i < files.length; i++) for (var i = 0; i < files.length; i++)
{ {
filereader = new FileReader(); filereader = new FileReader();
filereader.file_name = files[i].name; filereader.file_name = files[i].name;
@ -103,35 +100,30 @@
Module.FS_createDataFile('/', name, dataView, true, false); Module.FS_createDataFile('/', name, dataView, true, false);
} }
var Module = var Module =
{ {
noInitialRun: true, noInitialRun: true,
arguments: ["-v", "--menu"], arguments: ["-v", "--menu"],
preRun: [], preRun: [],
postRun: [], postRun: [],
print: (function() print: (function()
{ {
var element = document.getElementById('output'); return function(text)
element.value = ''; // clear browser cache
return function(text)
{ {
text = Array.prototype.slice.call(arguments).join(' '); text = Array.prototype.slice.call(arguments).join(' ');
element.value += text + "\n"; console.log(text);
element.scrollTop = 99999; // focus on bottom
}; };
})(), })(),
printErr: function(text) printErr: function(text)
{ {
var text = Array.prototype.slice.call(arguments).join(' '); var errArgs = Array.prototype.slice.call(arguments).join(' ');
var element = document.getElementById('output'); console.error(errArgs);
element.value += text + "\n";
element.scrollTop = 99999; // focus on bottom
}, },
canvas: document.getElementById('canvas'), canvas: document.getElementById('canvas'),
totalDependencies: 0, totalDependencies: 0,
monitorRunDependencies: function(left) monitorRunDependencies: function(left)
{ {
this.totalDependencies = Math.max(this.totalDependencies, left); this.totalDependencies = Math.max(this.totalDependencies, left);
} }
@ -139,4 +131,4 @@
</script> </script>
<script type="text/javascript" src="browserfs.js"></script> <script type="text/javascript" src="browserfs.js"></script>
<script type="text/javascript" src="gambatte.js"></script> <script type="text/javascript" src="gambatte.js"></script>