Skip to content

ace.js: Don't use srcdoc when creating iframes #5124

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
rhansen merged 3 commits into from
Jul 30, 2021
Merged

ace.js: Don't use srcdoc when creating iframes #5124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c963a8
ace2_inner.js: Delete unnecessary `ace_outerWin` variable
rhansen Jul 29, 2021
9fda5ad
ace2_inner.js: Improve discovery of `sidediv` and `linemetricsdiv`
rhansen Jul 29, 2021
e61888d
ace.js: Don't use srcdoc when creating iframes (see #4975)
webzwo0i Jul 20, 2021
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
1 change: 1 addition & 0 deletions src/static/empty.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!DOCTYPE html><html><head><title>Empty</title></head><body></body></html>
7 changes: 4 additions & 3 deletions src/static/js/ace.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,9 @@ const Ace2Editor = function () {
// - Chrome never fires any events on the frame or document. Eventually the document's
// readyState becomes 'complete' even though it never fires a readystatechange event.
// - Safari behaves like Chrome.
outerFrame.srcdoc = '<!DOCTYPE html>';
// srcdoc is avoided because Firefox's Content Security Policy engine does not properly handle
// 'self' with nested srcdoc iframes: https://bugzilla.mozilla.org/show_bug.cgi?id=1721296
outerFrame.src = '../static/empty.html';
info.frame = outerFrame;
document.getElementById(containerId).appendChild(outerFrame);
const outerWindow = outerFrame.contentWindow;
Expand Down Expand Up @@ -240,8 +242,7 @@ const Ace2Editor = function () {
innerFrame.allowTransparency = true; // for IE
// The iframe MUST have a src or srcdoc property to avoid browser quirks. See the comment above
// outerFrame.srcdoc.
innerFrame.srcdoc = '<!DOCTYPE html>';
innerFrame.ace_outerWin = outerWindow;
innerFrame.src = 'empty.html';
outerDocument.body.insertBefore(innerFrame, outerDocument.body.firstChild);
const innerWindow = innerFrame.contentWindow;

Expand Down
9 changes: 4 additions & 5 deletions src/static/js/ace2_inner.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,10 @@ function Ace2Inner(editorInfo, cssManagers) {
window.focus();
};

const iframe = window.frameElement;
const outerWin = iframe.ace_outerWin;
iframe.ace_outerWin = null; // prevent IE 6 memory leak
const sideDiv = iframe.nextSibling;
const lineMetricsDiv = sideDiv.nextSibling;
const outerWin = window.parent;
const outerDoc = outerWin.document;
const sideDiv = outerDoc.getElementById('sidediv');
const lineMetricsDiv = outerDoc.getElementById('linemetricsdiv');
let lineNumbersShown;
let sideDivInner;

Expand Down