public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
pull/4154/head
John McLear 2020-07-08 14:50:48 +01:00 committed by GitHub
parent 27c56109c7
commit a3386e3e55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/node/handler/ImportHandler.js
View File

@ -286,15 +286,6 @@ exports.doImport = function (req, res, padId)
}
}).then(() => {
// close the connection
res.send(
"<head> \
<script type='text/javascript' src='../../static/js/jquery.js'></script> \
</head> \
<script> \
$(window).load(function(){ \
var impexp = window.parent.padimpexp.handleFrameCall('" + req.directDatabaseAccess +"', '" + status + "'); \
}) \
</script>"
);
res.send("<script>document.addEventListener('DOMContentLoaded', function(){ var impexp = window.parent.padimpexp.handleFrameCall('" + req.directDatabaseAccess +"', '" + status + "'); })</script>");
});
}

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

@ -244,6 +244,7 @@ var padimpexp = (function()
},
handleFrameCall: function(directDatabaseAccess, status)
{
if(directDatabaseAccess === "undefined") directDatabaseAccess = false;
if (status !== "ok")
{
importFailed(status);