infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

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

pull/1/head
Caleb James DeLisle 2017-08-16 12:40:15 +02:00
parent e6cdf955d3
commit 6b174934c8
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -470,14 +470,10 @@
// CryptPad
var _iframe = window._iframe = iframe.$;
var fw = this;
var intr = setInterval(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);
}
}, 10);
var fw = this;
_iframe.contentWindow.onload = function () {
CKEDITOR.tools.callFunction(fw._.frameLoadedHandler, _iframe.contentWindow);
};
return;
// Work around Firefox bug - error prune when called from XUL (http://dev.ckeditor.com/ticket/320),