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

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

Browse Source
This commit is contained in:
ansuz 2017-08-30 11:31:59 +02:00
commit 9a23b77b46
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
customize.dist/src/less/toolbar.less
View File

@ -43,8 +43,6 @@
right: 0; right: 0;
display: flex; display: flex;
flex-flow: column; flex-flow: column;
height: 100vh;
width: 100vw;
} }
.cke_toolbox_main { .cke_toolbox_main {
display: inline-block; display: inline-block;
@ -56,7 +54,7 @@
display: flex; display: flex;
overflow: visible; overflow: visible;
iframe { iframe {
height: 100%; min-height: 100%;
width: 100%; width: 100%;
} }
} }

9
www/pad/inner.js
View File

@ -773,11 +773,18 @@ define([
} }
// Used in ckeditor-config.js // Used in ckeditor-config.js
Ckeditor.CRYPTPAD_URLARGS = ApiConfig.requireConf.urlArgs; Ckeditor.CRYPTPAD_URLARGS = ApiConfig.requireConf.urlArgs;
editor = Ckeditor.replace('editor1', { module.ckeditor = editor = Ckeditor.replace('editor1', {
customConfig: '/customize/ckeditor-config.js', customConfig: '/customize/ckeditor-config.js',
}); });
editor.on('instanceReady', waitFor()); editor.on('instanceReady', waitFor());
}).nThen(function (/*waitFor*/) { }).nThen(function (/*waitFor*/) {
/*if (Ckeditor.env.safari) {
var fixIframe = function () {
$('iframe.cke_wysiwyg_frame').height($('#cke_1_contents').height());
};
$(window).resize(fixIframe);
fixIframe();
}*/
Links.addSupportForOpeningLinksInNewTab(Ckeditor)({editor: editor}); Links.addSupportForOpeningLinksInNewTab(Ckeditor)({editor: editor});
Cryptpad.onError(function (info) { Cryptpad.onError(function (info) {
if (info && info.type === "store") { if (info && info.type === "store") {