Merge remote-tracking branch 'origin/master' into dev

This commit is contained in:
Andrew 2022-06-12 13:24:43 -04:00
commit 9ba7dac723

View File

@ -220,7 +220,7 @@
};
wsInternal.onclose = function (closeEvent) {
console.log('Closed WebSocket', closeEvent);
warn('WebSockets are required for Crafty to work. This websocket connection has been closed. Are you using a reverse proxy?', 'https://wiki.craftycontrol.com/en/4/docs/Reverse%20Proxy%20Examples')
setTimeout(sendWssError, 7000);
};
@ -339,6 +339,10 @@
});
}
function sendWssError(){
warn('WebSockets are required for Crafty to work. This websocket connection has been closed. Are you using a reverse proxy?', 'https://wiki.craftycontrol.com/en/4/docs/Reverse%20Proxy%20Examples')
}
function eulaAgree(server_id, command) {
//< !--this getCookie function is in base.html-- >
var token = getCookie("_xsrf");