huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix conflicts / rebase (#1412)

This commit is contained in:
Andrew Stanton-Nurse 2018-02-06 10:49:54 -08:00 committed by GitHub
parent bfb86b71df
commit 57ce00d9ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
samples/SocketsSample/wwwroot/hubs.html
View File

@ -97,12 +97,32 @@
let connectButton = document.getElementById('connect'); let connectButton = document.getElementById('connect');
let disconnectButton = document.getElementById('disconnect'); let disconnectButton = document.getElementById('disconnect');
disconnectButton.disabled = true; let broadcastButton = document.getElementById('broadcast');
let broadcastExceptMeButton = document.getElementById('broadcast-exceptme');
let sendToConnectionButton = document.getElementById('connection-send');
let joinGroupButton = document.getElementById('join-group');
let leaveGroupButton = document.getElementById('leave-group');
let groupMsgButton = document.getElementById('groupmsg');
let othersGroupMsgButton = document.getElementById('others-groupmsg');
let sendButton = document.getElementById('send');
function updateButtonState(isConnected) {
broadcastButton.disabled = !isConnected;
broadcastExceptMeButton.disabled = !isConnected;
sendToConnectionButton.disabled = !isConnected;
joinGroupButton.disabled = !isConnected;
leaveGroupButton.disabled = !isConnected;
groupMsgButton.disabled = !isConnected;
othersGroupMsgButton.disabled = !isConnected;
sendButton.disabled = !isConnected;
disconnectButton.disabled = !isConnected;
connectButton.disabled = isConnected;
}
updateButtonState(false);
var connection; var connection;
click('connect', function (event) { click('connect', function (event) {
connectButton.disabled = true;
disconnectButton.disabled = false;
console.log('http://' + document.location.host + '/' + hubRoute); console.log('http://' + document.location.host + '/' + hubRoute);
connection = new signalR.HubConnection(hubRoute, { transport: transportType, logger: logger }); connection = new signalR.HubConnection(hubRoute, { transport: transportType, logger: logger });
connection.on('Send', function (msg) { connection.on('Send', function (msg) {
@ -116,24 +136,26 @@
else { else {
addLine('message-list', 'Disconnected', 'green'); addLine('message-list', 'Disconnected', 'green');
} }
updateButtonState(false);
}); });
connection.start() connection.start()
.then(function () { .then(function () {
isConnected = true; isConnected = true;
updateButtonState(true);
addLine('message-list', 'Connected successfully', 'green'); addLine('message-list', 'Connected successfully', 'green');
}) })
.catch(function (err) { .catch(function (err) {
updateButtonState(false);
addLine('message-list', err, 'red'); addLine('message-list', err, 'red');
}); });
}); });
click('disconnect', function (event) { click('disconnect', function (event) {
connectButton.disabled = false;
disconnectButton.disabled = true;
connection.stop() connection.stop()
.then(function () { .then(function () {
isConnected = false; isConnected = false;
updateButtonState(false);
}); });
}); });