libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-02-01 03:12:42 +01:00
Code Issues Projects Releases Wiki Activity

ImportHandler: Use JSON.stringify() to properly escape characters

Browse source
This commit is contained in:
Richard Hansen 2021-02-07 19:38:14 -05:00 committed by John McLear
parent ed80883709
commit 26b5a69ccc
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/node/handler/ImportHandler.js
View file

@ -276,7 +276,7 @@ exports.doImport = (req, res, padId) => {
'<script>', '<script>',
"document.addEventListener('DOMContentLoaded', () => {", "document.addEventListener('DOMContentLoaded', () => {",
' window.parent.padimpexp.handleFrameCall(', ' window.parent.padimpexp.handleFrameCall(',
` '${req.directDatabaseAccess}', '${status}');`, ` ${JSON.stringify(!!req.directDatabaseAccess)}, ${JSON.stringify(status)});`,
'});', '});',
'</script>', '</script>',
].join('\n')); ].join('\n'));

1
src/static/js/pad_impexp.js
View file

@ -171,7 +171,6 @@ const padimpexp = (() => {
$('.disabledexport').click(cantExport); $('.disabledexport').click(cantExport);
}, },
handleFrameCall: (directDatabaseAccess, status) => { handleFrameCall: (directDatabaseAccess, status) => {
if (directDatabaseAccess === 'undefined') directDatabaseAccess = false;
if (status !== 'ok') { if (status !== 'ok') {
importErrorMessage(status); importErrorMessage(status);
} else { } else {