Update the userlist in code, slide and pad

This commit is contained in:
yflory
2017-06-22 15:52:25 +02:00
parent dcfc59c2e2
commit 13288ee18b
12 changed files with 850 additions and 625 deletions

View File

@@ -49,6 +49,7 @@ define([
var andThen = function (CMeditor) {
var $iframe = $('#pad-iframe').contents();
var $contentContainer = $iframe.find('#editorContainer');
var CodeMirror = Cryptpad.createCodemirror(CMeditor, ifrw, Cryptpad);
editor = CodeMirror.editor;
@@ -358,7 +359,8 @@ define([
ifrw: ifrw,
realtime: info.realtime,
network: info.network,
$container: $bar
$container: $bar,
$contentContainer: $contentContainer
};
toolbar = module.toolbar = Toolbar.create(configTb);