Skip to content

Fix duplicated iframes after importing text in a pad #3925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
muxator merged 2 commits into from
Apr 26, 2020
Merged

Fix duplicated iframes after importing text in a pad #3925

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fea74cc
Merge pull request #11 from ether/develop
JohnMcLear Apr 25, 2020
0350811
pad.js: in switchToPad() remove the first iframe before loading the pad
JohnMcLear Apr 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/static/js/pad.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,11 @@ var pad = {
},
switchToPad: function(padId)
{
// destroy old pad from DOM
// See https://github.com/ether/etherpad-lite/pull/3915
// TODO: Check if Destroying is enough and doesn't leave negative stuff
// See ace.js "editor.destroy" for a reference of how it was done before
$('#editorcontainer').find("iframe")[0].remove();
var options = document.location.href.split('?')[1];
var newHref = padId;
if (typeof options != "undefined" && options != null){
Expand Down