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

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

pull/1/head
ansuz 2017-07-03 11:39:21 +02:00
parent 6ac056e314 9b131dc49c
commit b15aa3360a
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/slide/inner.js
View File

@ -3,6 +3,10 @@ define([
'less!/customize/src/less/toolbar.less',
'less!/customize/src/less/cryptpad.less',
'less!/slide/slide.less',
'css!cm/lib/codemirror.css',
'css!cm/addon/dialog/dialog.css',
'css!cm/addon/fold/foldgutter.css',
], function ($) {
$('.loading-hidden').removeClass('loading-hidden');
});

2
www/slide/main.js
View File

@ -53,7 +53,7 @@ define([
var andThen = function () {
var $iframe = $('#pad-iframe').contents();
var $contentContainer = $iframe.find('#editorContainer');
var CodeMirror = Cryptpad.createCodemirror(ifrw, Cryptpad, 'slide');
var CodeMirror = Cryptpad.createCodemirror(ifrw, Cryptpad, 'markdown');
editor = CodeMirror.editor;
var $bar = $('#pad-iframe')[0].contentWindow.$('#cme_toolbox');