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

Fix syntax highlighting

Browse Source
This commit is contained in:
yflory
2017-07-03 10:55:25 +02:00
parent 335898a4c7
commit 5694505719
8 changed files with 45 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
www/slide/main.js
View File

@@ -50,10 +50,10 @@ define([
Cryptpad.errorLoadingScreen(Messages.websocketError);
};
var andThen = function (CMeditor) {
var andThen = function () {
var $iframe = $('#pad-iframe').contents();
var $contentContainer = $iframe.find('#editorContainer');
var CodeMirror = Cryptpad.createCodemirror(CMeditor, ifrw, Cryptpad);
var CodeMirror = Cryptpad.createCodemirror(ifrw, Cryptpad, 'slide');
editor = CodeMirror.editor;
var $bar = $('#pad-iframe')[0].contentWindow.$('#cme_toolbox');
@@ -697,9 +697,9 @@ define([
var interval = 100;
var second = function (CM) {
var first = function () {
Cryptpad.ready(function () {
andThen(CM);
andThen();
Cryptpad.reportAppUsage();
});
Cryptpad.onError(function (info) {
@@ -709,17 +709,6 @@ define([
});
};
var first = function () {
if (ifrw.CodeMirror) {
// it exists, call your continuation
second(ifrw.CodeMirror);
} else {
console.log("CodeMirror was not defined. Trying again in %sms", interval);
// try again in 'interval' ms
setTimeout(first, interval);
}
};
first();
});
});