From 4f0768282f8aad00b36bd3f55db8c4c386d70c99 Mon Sep 17 00:00:00 2001 From: rofl256 Date: Fri, 9 Jun 2017 08:41:23 +0200 Subject: [PATCH] add support for special characters in questions --- web/js/main.js | 2 +- web/js/websocket.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/js/main.js b/web/js/main.js index dd7bd65..9c8c0fd 100644 --- a/web/js/main.js +++ b/web/js/main.js @@ -336,7 +336,7 @@ function saveQuestions() { objToSave.push(oneQ); }); var jsonQues = JSON.stringify(objToSave); - jsonQues = btoa(jsonQues); + jsonQues = btoa(encodeURIComponent(jsonQues)); wsSend("fileOp","write###fragen.txt###"+jsonQues); } diff --git a/web/js/websocket.js b/web/js/websocket.js index dbe639c..e749067 100644 --- a/web/js/websocket.js +++ b/web/js/websocket.js @@ -115,7 +115,7 @@ var connectWs = function() { } else if(key == "file") { if(value == "fragen.txt") { try { - var base64 = atob(messageParts_a[2]); + var base64 = decodeURIComponent(atob(messageParts_a[2])); fragen = JSON.parse(base64); fillFragenEditor(); fillFragenSelect();