Fixing @davidfowl's shitty web code.

This commit is contained in:
DamianEdwards 2016-10-05 10:27:48 -07:00
parent 3f5e340b9f
commit c641a43f38
5 changed files with 60 additions and 37 deletions

View File

@ -14,11 +14,11 @@
console.log('Opened!');
};
ws.onmessage = function (evt) {
var response = JSON.parse(evt.data);
ws.onmessage = function (event) {
var response = JSON.parse(event.data);
// Response
if (response.id) {
if (typeof response.id === "number") {
var cb = calls[response.id];
delete calls[response.id];
@ -36,7 +36,7 @@
}
};
ws.onclose = function (evt) {
ws.onclose = function (event) {
console.log('Closed!');
};
@ -55,7 +55,7 @@
document.addEventListener('DOMContentLoaded', () => {
var conn = new hubConnection('ws://localhost:5000/hubs/ws');
var conn = new hubConnection(`ws://${document.location.host}/hubs/ws`);
conn.on('Send', function (message) {
var child = document.createElement('li');
@ -63,7 +63,7 @@
document.getElementById('messages').appendChild(child);
});
document.getElementById('sendmessage').addEventListener('click', () => {
document.getElementById('sendmessage').addEventListener('submit', event => {
let data = document.getElementById('data').value;
conn.invoke('SocketsSample.Hubs.Chat.Send', [data]).catch(err => {
@ -72,6 +72,8 @@
child.innerText = err;
document.getElementById('messages').appendChild(child);
});
event.preventDefault();
});
});
@ -79,8 +81,11 @@
</head>
<body>
<h1>WebSockets</h1>
<input type="text" id="data" />
<input type="button" id="sendmessage" value="Send" />
<form id="sendmessage">
<input type="text" id="data" />
<input type="submit" value="Send" />
</form>
<ul id="messages"></ul>
</body>

View File

@ -16,7 +16,8 @@
xhr.onload = () => {
if (xhr.status >= 200 && xhr.status < 300) {
resolve(xhr.response);
} else {
}
else {
reject({
status: xhr.status,
statusText: xhr.statusText
@ -47,7 +48,7 @@
this.onopen = function () { };
this.onmessage = function () { };
this.onerror = function (evt) { };
this.onerror = function (event) { };
this.send = function (data) {
if (!sock.connectionId) {
throw "Not connected";
@ -80,23 +81,27 @@
console.log('Opened!');
};
sock.onmessage = function (evt) {
sock.onmessage = function (event) {
var child = document.createElement('li');
child.innerText = evt.data;
child.innerText = event.data;
document.getElementById('messages').appendChild(child);
};
document.getElementById('sendmessage').addEventListener('click', () => {
document.getElementById('sendmessage').addEventListener('submit', event => {
let data = document.getElementById('data').value;
sock.send(data);
event.preventDefault();
});
});
</script>
</head>
<body>
<h1>Long Polling</h1>
<input type="text" id="data" />
<input type="button" id="sendmessage" value="Send" />
<form id="sendmessage">
<input type="text" id="data" />
<input type="submit" value="Send" />
</form>
<ul id="messages"></ul>
</body>

View File

@ -13,8 +13,8 @@
console.log('Opened!');
};
ws.onmessage = function (evt) {
var response = JSON.parse(evt.data);
ws.onmessage = function (event) {
var response = JSON.parse(event.data);
var cb = calls[response.id];
@ -28,7 +28,7 @@
}
};
ws.onclose = function (evt) {
ws.onclose = function (event) {
console.log('Closed!');
};
@ -43,9 +43,9 @@
document.addEventListener('DOMContentLoaded', () => {
var rpc = new jsonRpc('ws://localhost:5000/jsonrpc/ws');
var rpc = new jsonRpc(`ws://${document.location.host}/jsonrpc/ws`);
document.getElementById('sendmessage').addEventListener('click', () => {
document.getElementById('sendmessage').addEventListener('submit', event => {
let data = document.getElementById('data').value;
rpc.invoke('SocketsSample.Echo.Send', [data]).then(result => {
@ -59,6 +59,8 @@
child.innerText = err;
document.getElementById('messages').appendChild(child);
});
event.preventDefault();
});
});
@ -66,8 +68,11 @@
</head>
<body>
<h1>WebSockets</h1>
<input type="text" id="data" />
<input type="button" id="sendmessage" value="Send" />
<form id="sendmessage">
<input type="text" id="data" />
<input type="submit" value="Send" />
</form>
<ul id="messages"></ul>
</body>

View File

@ -16,7 +16,8 @@
xhr.onload = () => {
if (xhr.status >= 200 && xhr.status < 300) {
resolve(xhr.response);
} else {
}
else {
reject({
status: xhr.status,
statusText: xhr.statusText
@ -35,7 +36,7 @@
this.onopen = function () { };
this.onmessage = function () { };
this.onerror = function (evt) { };
this.onerror = function (event) { };
this.send = function (data) {
if (!sock.connectionId) {
throw "Not connected";
@ -79,15 +80,16 @@
console.log('Opened!');
};
sock.onmessage = function (evt) {
sock.onmessage = function (event) {
var child = document.createElement('li');
child.innerText = evt.data;
child.innerText = event.data;
document.getElementById('messages').appendChild(child);
};
document.getElementById('sendmessage').addEventListener('click', () => {
document.getElementById('sendmessage').addEventListener('submit', event => {
let data = document.getElementById('data').value;
sock.send(data);
event.preventDefault();
});
});
@ -95,8 +97,11 @@
</head>
<body>
<h1>Server Sent Events</h1>
<input type="text" id="data" />
<input type="button" id="sendmessage" value="Send" />
<form id="sendmessage">
<input type="text" id="data" />
<input type="submit" value="Send" />
</form>
<ul id="messages"></ul>
</body>

View File

@ -5,34 +5,37 @@
<title></title>
<script>
document.addEventListener('DOMContentLoaded', () => {
var ws = new WebSocket('ws://localhost:5000/chat/ws');
var ws = new WebSocket(`ws://${document.location.host}/chat/ws`);
ws.onopen = function () {
console.log('Opened!');
};
ws.onmessage = function (evt) {
ws.onmessage = function (event) {
var child = document.createElement('li');
child.innerText = evt.data;
child.innerText = event.data;
document.getElementById('messages').appendChild(child);
};
ws.onclose = function (evt) {
ws.onclose = function (event) {
console.log('Closed!');
};
document.getElementById('sendmessage').addEventListener('click', () => {
document.getElementById('sendmessage').addEventListener('submit', event => {
let data = document.getElementById('data').value;
ws.send(data);
event.preventDefault();
});
});
</script>
</head>
<body>
<h1>WebSockets</h1>
<input type="text" id="data" />
<input type="button" id="sendmessage" value="Send" />
<form id="sendmessage">
<input type="text" id="data" />
<input type="submit" value="Send" />
</form>
<ul id="messages">