trivabble/trivabble
trivabble
/
trivabble
2
1
Fork 1
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into automatic_scoring

This commit is contained in:
Laurent Mazet 2020-11-19 07:34:38 +01:00
parent ea2485f71d dddee16ee5
commit 9d041e812e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/trivabble.js
View File

@ -2175,9 +2175,9 @@
} else {
myPrompt(
_("It seems your did not give your name. You need to do it for the game to run properly."),
function (name) {
if (name && name.trim()) {
setSetting("PlayerName", name.trim());
function (newName) {
if (newName && newName.trim()) {
setSetting("PlayerName", newName.trim());
}
repromptName(f);

2
server/trivabble-server.js
View File

@ -1009,7 +1009,7 @@ function handleRequest(request, response) {
"script-src 'self'; " +
"style-src 'self'; " +
"img-src 'self'; " +
(disableCSP ? "" : "connect-src 'self' " + (
(disableCSP ? "connect-src *; " : "connect-src 'self' " + (
// uzbl (like Safari 9 / iPad 2) does not like insecure websockets on the
// same port with connect-src 'self'
// See https://github.com/w3c/webappsec-csp/issues/7