From c641a43f38b9f23a5eeb6db8debb14c2b132ec38 Mon Sep 17 00:00:00 2001 From: DamianEdwards Date: Wed, 5 Oct 2016 10:27:48 -0700 Subject: [PATCH] Fixing @davidfowl's shitty web code. --- samples/SocketsSample/wwwroot/hubs.html | 21 +++++++++++++-------- samples/SocketsSample/wwwroot/polling.html | 19 ++++++++++++------- samples/SocketsSample/wwwroot/rpc.html | 19 ++++++++++++------- samples/SocketsSample/wwwroot/sse.html | 19 ++++++++++++------- samples/SocketsSample/wwwroot/ws.html | 19 +++++++++++-------- 5 files changed, 60 insertions(+), 37 deletions(-) diff --git a/samples/SocketsSample/wwwroot/hubs.html b/samples/SocketsSample/wwwroot/hubs.html index 997e955c41..65f72df842 100644 --- a/samples/SocketsSample/wwwroot/hubs.html +++ b/samples/SocketsSample/wwwroot/hubs.html @@ -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 @@

WebSockets

- - + +
+ + +
diff --git a/samples/SocketsSample/wwwroot/polling.html b/samples/SocketsSample/wwwroot/polling.html index 5405dd9a49..789e92f6cf 100644 --- a/samples/SocketsSample/wwwroot/polling.html +++ b/samples/SocketsSample/wwwroot/polling.html @@ -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(); }); });

Long Polling

- - + +
+ + +
diff --git a/samples/SocketsSample/wwwroot/rpc.html b/samples/SocketsSample/wwwroot/rpc.html index 5884277e9b..2090ee3120 100644 --- a/samples/SocketsSample/wwwroot/rpc.html +++ b/samples/SocketsSample/wwwroot/rpc.html @@ -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 @@

WebSockets

- - + +
+ + +
diff --git a/samples/SocketsSample/wwwroot/sse.html b/samples/SocketsSample/wwwroot/sse.html index 75905f3f17..05921c3a4a 100644 --- a/samples/SocketsSample/wwwroot/sse.html +++ b/samples/SocketsSample/wwwroot/sse.html @@ -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 @@

Server Sent Events

- - + +
+ + +
diff --git a/samples/SocketsSample/wwwroot/ws.html b/samples/SocketsSample/wwwroot/ws.html index 894ff130ae..77ce4c0bf1 100644 --- a/samples/SocketsSample/wwwroot/ws.html +++ b/samples/SocketsSample/wwwroot/ws.html @@ -5,34 +5,37 @@

WebSockets

- - + +
+ + +