Skip to content

Commit 4d4633d

Browse files
sbc100sbc100
authored
Simplify shell html code (#23604)
Use method style syntax and avoid iffes where it makes the code more readable.
1 parent 72fe8a9 commit 4d4633d

File tree

2 files changed

+54
-57
lines changed

2 files changed

+54
-57
lines changed

‎src/shell.html

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -33,41 +33,40 @@
3333
var statusElement = document.getElementById('status');
3434
var progressElement = document.getElementById('progress');
3535
var spinnerElement = document.getElementById('spinner');
36+
var canvasElement = document.getElementById('canvas');
37+
var outputElement = document.getElementById('output');
38+
if (outputElement) outputElement.value = ''; // clear browser cache
39+
40+
// As a default initial behavior, pop up an alert when webgl context is lost. To make your
41+
// application robust, you may want to override this behavior before shipping!
42+
// See http://www.khronos.org/registry/webgl/specs/latest/1.0/#5.15.2
43+
canvasElement.addEventListener('webglcontextlost', (e) => {
44+
alert('WebGL context lost. You will need to reload the page.');
45+
e.preventDefault();
46+
}, false);
3647

3748
var Module = {
38-
print: (function() {
39-
var element = document.getElementById('output');
40-
if (element) element.value = ''; // clear browser cache
41-
return (...args) => {
49+
print(...args) {
50+
console.log(...args);
51+
// These replacements are necessary if you render to raw HTML
52+
//text = text.replace(/&/g, "&");
53+
//text = text.replace(/</g, "&lt;");
54+
//text = text.replace(/>/g, "&gt;");
55+
//text = text.replace('\n', '<br>', 'g');
56+
if (outputElement) {
4257
var text = args.join(' ');
43-
// These replacements are necessary if you render to raw HTML
44-
//text = text.replace(/&/g, "&amp;");
45-
//text = text.replace(/</g, "&lt;");
46-
//text = text.replace(/>/g, "&gt;");
47-
//text = text.replace('\n', '<br>', 'g');
48-
console.log(text);
49-
if (element) {
50-
element.value += text + "\n";
51-
element.scrollTop = element.scrollHeight; // focus on bottom
52-
}
53-
};
54-
})(),
55-
canvas: (() => {
56-
var canvas = document.getElementById('canvas');
57-
58-
// As a default initial behavior, pop up an alert when webgl context is lost. To make your
59-
// application robust, you may want to override this behavior before shipping!
60-
// See http://www.khronos.org/registry/webgl/specs/latest/1.0/#5.15.2
61-
canvas.addEventListener("webglcontextlost", (e) => { alert('WebGL context lost. You will need to reload the page.'); e.preventDefault(); }, false);
62-
63-
return canvas;
64-
})(),
65-
setStatus: (text) => {
58+
outputElement.value += text + "\n";
59+
outputElement.scrollTop = outputElement.scrollHeight; // focus on bottom
60+
}
61+
},
62+
canvas: canvasElement,
63+
setStatus(text) {
6664
Module.setStatus.last ??= { time: Date.now(), text: '' };
6765
if (text === Module.setStatus.last.text) return;
6866
var m = text.match(/([^(]+)\((\d+(\.\d+)?)\/(\d+)\)/);
6967
var now = Date.now();
70-
if (m && now - Module.setStatus.last.time < 30) return; // if this is a progress update, skip it if too soon
68+
// if this is a progress update, skip it if too soon
69+
if (m && now - Module.setStatus.last.time < 30) return;
7170
Module.setStatus.last.time = now;
7271
Module.setStatus.last.text = text;
7372
if (m) {
@@ -85,7 +84,7 @@
8584
statusElement.innerHTML = text;
8685
},
8786
totalDependencies: 0,
88-
monitorRunDependencies: (left) => {
87+
monitorRunDependencies(left) {
8988
this.totalDependencies = Math.max(this.totalDependencies, left);
9089
Module.setStatus(left ? 'Preparing... (' + (this.totalDependencies-left) + '/' + this.totalDependencies + ')' : 'All downloads complete.');
9190
}

‎src/shell_minimal.html

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -72,36 +72,34 @@
7272
var statusElement = document.getElementById('status');
7373
var progressElement = document.getElementById('progress');
7474
var spinnerElement = document.getElementById('spinner');
75+
var canvasElement = document.getElementById('canvas');
76+
var outputElement = document.getElementById('output');
77+
if (outputElement) outputElement.value = ''; // clear browser cache
78+
79+
// As a default initial behavior, pop up an alert when webgl context is lost. To make your
80+
// application robust, you may want to override this behavior before shipping!
81+
// See http://www.khronos.org/registry/webgl/specs/latest/1.0/#5.15.2
82+
canvasElement.addEventListener("webglcontextlost", (e) => {
83+
alert('WebGL context lost. You will need to reload the page.');
84+
e.preventDefault();
85+
}, false);
7586

7687
var Module = {
77-
print: (function() {
78-
var element = document.getElementById('output');
79-
if (element) element.value = ''; // clear browser cache
80-
return (...args) => {
88+
print(...args) {
89+
// These replacements are necessary if you render to raw HTML
90+
//text = text.replace(/&/g, "&amp;");
91+
//text = text.replace(/</g, "&lt;");
92+
//text = text.replace(/>/g, "&gt;");
93+
//text = text.replace('\n', '<br>', 'g');
94+
console.log(...args);
95+
if (outputElement) {
8196
var text = args.join(' ');
82-
// These replacements are necessary if you render to raw HTML
83-
//text = text.replace(/&/g, "&amp;");
84-
//text = text.replace(/</g, "&lt;");
85-
//text = text.replace(/>/g, "&gt;");
86-
//text = text.replace('\n', '<br>', 'g');
87-
console.log(text);
88-
if (element) {
89-
element.value += text + "\n";
90-
element.scrollTop = element.scrollHeight; // focus on bottom
91-
}
92-
};
93-
})(),
94-
canvas: (() => {
95-
var canvas = document.getElementById('canvas');
96-
97-
// As a default initial behavior, pop up an alert when webgl context is lost. To make your
98-
// application robust, you may want to override this behavior before shipping!
99-
// See http://www.khronos.org/registry/webgl/specs/latest/1.0/#5.15.2
100-
canvas.addEventListener("webglcontextlost", (e) => { alert('WebGL context lost. You will need to reload the page.'); e.preventDefault(); }, false);
101-
102-
return canvas;
103-
})(),
104-
setStatus: (text) => {
97+
outputElement.value += text + "\n";
98+
outputElement.scrollTop = outputElement.scrollHeight; // focus on bottom
99+
}
100+
},
101+
canvas: canvasElement,
102+
setStatus(text) {
105103
Module.setStatus.last ??= { time: Date.now(), text: '' };
106104
if (text === Module.setStatus.last.text) return;
107105
var m = text.match(/([^(]+)\((\d+(\.\d+)?)\/(\d+)\)/);
@@ -124,7 +122,7 @@
124122
statusElement.innerHTML = text;
125123
},
126124
totalDependencies: 0,
127-
monitorRunDependencies: (left) => {
125+
monitorRunDependencies(left) {
128126
this.totalDependencies = Math.max(this.totalDependencies, left);
129127
Module.setStatus(left ? 'Preparing... (' + (this.totalDependencies-left) + '/' + this.totalDependencies + ')' : 'All downloads complete.');
130128
}

0 commit comments

Comments
 (0)