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

load codemirror in the correct context. fix selection events

Browse Source
This commit is contained in:
ansuz
2017-07-04 12:37:24 +02:00
parent 7377d39b39
commit ac8da0d52d
5 changed files with 87 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
www/code/main.js
View File

@@ -42,7 +42,7 @@ define([
Cryptpad.errorLoadingScreen(Messages.websocketError);
};
var andThen = function () {
var andThen = function (CMeditor) {
var $iframe = $('#pad-iframe').contents();
var $contentContainer = $iframe.find('#editorContainer');
var $previewContainer = $iframe.find('#previewContainer');
@@ -58,7 +58,7 @@ define([
}
});
var CodeMirror = Cryptpad.createCodemirror(ifrw, Cryptpad);
var CodeMirror = Cryptpad.createCodemirror(ifrw, Cryptpad, null, CMeditor);
$iframe.find('.CodeMirror').addClass('fullPage');
editor = CodeMirror.editor;
@@ -428,9 +428,10 @@ define([
Cryptpad.onLogout(function () { setEditable(false); });
};
var first = function () {
var interval = 100;
var second = function (CM) {
Cryptpad.ready(function () {
andThen();
andThen(CM);
Cryptpad.reportAppUsage();
});
Cryptpad.onError(function (info) {
@@ -440,6 +441,15 @@ define([
});
};
var first = function () {
if (ifrw.CodeMirror) {
second(ifrw.CodeMirror);
} else {
console.log("CodeMirror was not defined. Trying again in %sms", interval);
setTimeout(first, interval);
}
};
first();
});
});