web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Try waiting for iframe document.onload instead of looping and waiting for document.body to exist.

Browse Source
This commit is contained in:
Caleb James DeLisle
2017-08-16 12:40:15 +02:00
parent e6cdf955d3
commit 6b174934c8
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
www/pad/wysiwygarea-plugin.js
View File

@@ -471,13 +471,9 @@
// CryptPad // CryptPad
var _iframe = window._iframe = iframe.$; var _iframe = window._iframe = iframe.$;
var fw = this; var fw = this;
var intr = setInterval(function () { _iframe.contentWindow.onload = function () {
//console.log(_iframe.contentWindow.document.body);
if (_iframe.contentWindow && _iframe.contentWindow.document && _iframe.contentWindow.document.body) {
clearInterval(intr);
CKEDITOR.tools.callFunction(fw._.frameLoadedHandler, _iframe.contentWindow); CKEDITOR.tools.callFunction(fw._.frameLoadedHandler, _iframe.contentWindow);
} };
}, 10);
return; return;
// Work around Firefox bug - error prune when called from XUL (http://dev.ckeditor.com/ticket/320), // Work around Firefox bug - error prune when called from XUL (http://dev.ckeditor.com/ticket/320),