From a3386e3e55c65d75b80896a9b75abafaa6c19b9a Mon Sep 17 00:00:00 2001 From: John McLear Date: Wed, 8 Jul 2020 14:50:48 +0100 Subject: [PATCH] Dont use jquery in import handler (#4153) I think jQ3 update broke imports a bit, so this removes jQuery and also ensures only .etherpad does reload of page. --- src/node/handler/ImportHandler.js | 11 +---------- src/static/js/pad_impexp.js | 1 + 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/node/handler/ImportHandler.js b/src/node/handler/ImportHandler.js index 23f238337..6ea76cac3 100644 --- a/src/node/handler/ImportHandler.js +++ b/src/node/handler/ImportHandler.js @@ -286,15 +286,6 @@ exports.doImport = function (req, res, padId) } }).then(() => { // close the connection - res.send( - " \ - \ - \ - " - ); + res.send(""); }); } diff --git a/src/static/js/pad_impexp.js b/src/static/js/pad_impexp.js index ac4982102..9c6404d4a 100644 --- a/src/static/js/pad_impexp.js +++ b/src/static/js/pad_impexp.js @@ -244,6 +244,7 @@ var padimpexp = (function() }, handleFrameCall: function(directDatabaseAccess, status) { + if(directDatabaseAccess === "undefined") directDatabaseAccess = false; if (status !== "ok") { importFailed(status);