Skip to content

Commit f4b7f18

Browse files
author
Schalk Neethling
committed
Merge remote-tracking branch 'ssw/main' into import-simple-shared-worker
2 parents ae7194f + 82206c5 commit f4b7f18

File tree

7 files changed

+78
-86
lines changed

7 files changed

+78
-86
lines changed

‎web-workers/simple-shared-worker/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# simple-shared-worker
22

3-
A simple demo to show shared worker basics. [View the example live](http://mdn.github.io/simple-shared-worker/).
3+
A simple demo to show shared worker basics. [View the example live](https://mdn.github.io/dom-examples/web-workers/simple-shared-worker/).

‎web-workers/simple-shared-worker/index.html

Lines changed: 34 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,36 @@
11
<!DOCTYPE html>
2-
<html>
3-
4-
<head>
5-
<meta charset="utf-8">
6-
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
7-
<meta name="viewport" content="width=device-width">
8-
9-
<title>Shared Workers basic example</title>
10-
11-
<link rel="stylesheet" href="style.css">
12-
</head>
13-
14-
<body>
15-
<h1>Shared<br>Workers<br>basic<br>example</h1>
16-
17-
<div class="controls" tabindex="0">
18-
19-
<form>
20-
<div>
21-
<label for="number1">Multiply number 1: </label>
22-
<input type="text" id="number1" value="0">
23-
</div>
24-
<div>
25-
<label for="number2">Multiply number 2: </label>
26-
<input type="text" id="number2" value="0">
27-
</div>
28-
</form>
29-
30-
<p class="result1">Result: 0</p>
31-
32-
<p><a href="index2.html" target="_blank">Go to second worker page</a></p>
33-
34-
</div>
35-
36-
<script src="multiply.js"></script>
37-
<script src="nosubmit.js"></script>
38-
</body>
39-
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8" />
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
6+
<meta name="viewport" content="width=device-width" />
7+
8+
<title>Shared Workers basic example</title>
9+
10+
<link rel="stylesheet" href="style.css" />
11+
</head>
12+
13+
<body>
14+
<h1>Shared<br />Workers<br />basic<br />example</h1>
15+
16+
<div class="controls" tabindex="0">
17+
<form>
18+
<div>
19+
<label for="number1">Multiply number 1: </label>
20+
<input type="text" id="number1" value="0" />
21+
</div>
22+
<div>
23+
<label for="number2">Multiply number 2: </label>
24+
<input type="text" id="number2" value="0" />
25+
</div>
26+
</form>
27+
28+
<p class="result1">Result: 0</p>
29+
30+
<p><a href="index2.html" target="_blank">Go to second worker page</a></p>
31+
</div>
32+
33+
<script src="multiply.js"></script>
34+
<script src="nosubmit.js"></script>
35+
</body>
4036
</html>

‎web-workers/simple-shared-worker/index2.html

Lines changed: 27 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,29 @@
11
<!DOCTYPE html>
2-
<html>
3-
4-
<head>
5-
<meta charset="utf-8">
6-
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
7-
<meta name="viewport" content="width=device-width">
8-
9-
<title>Shared Workers basic example</title>
10-
11-
<link rel="stylesheet" href="style.css">
12-
</head>
13-
14-
<body>
15-
<h1>Shared<br>Workers<br>basic<br>example</h1>
16-
17-
<div class="controls" tabindex="0">
18-
19-
<form>
20-
<div>
21-
<label for="number3">Square number: </label>
22-
<input type="text" id="number3" value="0">
23-
</div>
24-
</form>
25-
26-
<p class="result2">Result: 0</p>
27-
28-
</div>
29-
<script src="square.js"></script>
30-
<script src="nosubmit.js"></script>
31-
</body>
32-
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8" />
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
6+
<meta name="viewport" content="width=device-width" />
7+
8+
<title>Shared Workers basic example</title>
9+
10+
<link rel="stylesheet" href="style.css" />
11+
</head>
12+
13+
<body>
14+
<h1>Shared<br />Workers<br />basic<br />example</h1>
15+
16+
<div class="controls" tabindex="0">
17+
<form>
18+
<div>
19+
<label for="number3">Square number: </label>
20+
<input type="text" id="number3" value="0" />
21+
</div>
22+
</form>
23+
24+
<p class="result2">Result: 0</p>
25+
</div>
26+
<script src="square.js"></script>
27+
<script src="nosubmit.js"></script>
28+
</body>
3329
</html>

‎web-workers/simple-shared-worker/multiply.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
var first = document.querySelector("#number1");
2-
var second = document.querySelector("#number2");
1+
const first = document.querySelector("#number1");
2+
const second = document.querySelector("#number2");
33

4-
var result1 = document.querySelector(".result1");
4+
const result1 = document.querySelector(".result1");
55

66
if (!!window.SharedWorker) {
7-
var myWorker = new SharedWorker("worker.js");
7+
const myWorker = new SharedWorker("worker.js");
88

99
first.onchange = function () {
1010
myWorker.port.postMessage([first.value, second.value]);

‎web-workers/simple-shared-worker/nosubmit.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var form = document.querySelector("form");
1+
const form = document.querySelector("form");
22

3-
form.onsubmit = function (e) {
4-
e.preventDefault();
3+
form.onsubmit = function (event) {
4+
event.preventDefault();
55
};

‎web-workers/simple-shared-worker/square.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
var squareNumber = document.querySelector("#number3");
1+
const squareNumber = document.querySelector("#number3");
22

3-
var result2 = document.querySelector(".result2");
3+
const result2 = document.querySelector(".result2");
44

55
if (!!window.SharedWorker) {
6-
var myWorker = new SharedWorker("worker.js");
6+
const myWorker = new SharedWorker("worker.js");
77

88
squareNumber.onchange = function () {
99
myWorker.port.postMessage([squareNumber.value, squareNumber.value]);
1010
console.log("Message posted to worker");
1111
};
1212

13-
myWorker.port.onmessage = function (e) {
14-
result2.textContent = e.data;
13+
myWorker.port.onmessage = function (event) {
14+
result2.textContent = event.data;
1515
console.log("Message received from worker");
1616
};
1717
}

‎web-workers/simple-shared-worker/worker.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
onconnect = function (e) {
2-
var port = e.ports[0];
1+
onconnect = function (event) {
2+
const port = event.ports[0];
33

4-
port.onmessage = function (e) {
5-
var workerResult = "Result: " + e.data[0] * e.data[1];
4+
port.onmessage = function () {
5+
const workerResult = `Result: ${e.data[0] * e.data[1]}`;
66
port.postMessage(workerResult);
77
};
88
};

0 commit comments

Comments
 (0)