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

main.js : wait until your editor is defined before trying to reference it. addresses a race condition that caused ckeditor to fail half the time.

Browse Source
This commit is contained in:
ansuz
2016-01-14 05:14:45 -05:00
parent ff52f050e5
commit c71b060dc2
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
www/pad/main.js
View File

@@ -10,7 +10,7 @@ define([
var ifrw = $('#pad-iframe')[0].contentWindow; var ifrw = $('#pad-iframe')[0].contentWindow;
var Ckeditor = ifrw.CKEDITOR; var Ckeditor = ifrw.CKEDITOR;
$(function () { var andThen = function () {
$(window).on('hashchange', function() { $(window).on('hashchange', function() {
window.location.reload(); window.location.reload();
}); });
@@ -32,12 +32,26 @@ define([
ifrw.$('iframe')[0].contentDocument.body.innerHTML = Messages.initialState; ifrw.$('iframe')[0].contentDocument.body.innerHTML = Messages.initialState;
var rtw = var rtw =
RTWysiwyg.start(ifrw, RTWysiwyg.start(ifrw, // window
Config.websocketURL, Config.websocketURL, // websocketUrl
Crypto.rand64(8), Crypto.rand64(8), // userName
key.channel, key.channel, // channel
key.cryptKey); key.cryptKey); // cryptKey
editor.on('change', function () { rtw.onEvent(); }); editor.on('change', function () { rtw.onEvent(); });
}); });
}); window.editor = editor;
window.RTWysiwyg = RTWysiwyg;
};
var interval = 100;
var first = function () {
if (Ckeditor = ifrw.CKEDITOR) {
andThen();
} else {
console.log("Ckeditor was not defined. Trying again in %sms",interval);
setTimeout(first, interval);
}
};
$(first);
}); });