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

Merge branch 'soon' into fileManager

Browse Source
This commit is contained in:
yflory
2017-01-10 15:07:48 +01:00
parent 2be5db9540 63b9d4e9fd
commit 4278ac7637
17 changed files with 207 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
www/pad/main.js
View File

@@ -62,6 +62,14 @@ define([
Cryptpad: Cryptpad,
};
var emitResize = module.emitResize = function () {
var cw = $('#pad-iframe')[0].contentWindow;
var evt = cw.document.createEvent('UIEvents');
evt.initUIEvent('resize', true, false, cw, 0);
cw.dispatchEvent(evt);
};
var toolbar;
var isNotMagicLine = function (el) {
@@ -630,14 +638,9 @@ define([
// this should only ever get called once, when the chain syncs
var onReady = realtimeOptions.onReady = function (info) {
if (!APP.isMaximized) {
if (!module.isMaximized) {
editor.execCommand('maximize');
// We have to call it 3 times in Safari in order to have the editor fully maximized -_-
if ((''+window.navigator.vendor).indexOf('Apple') !== -1) {
editor.execCommand('maximize');
editor.execCommand('maximize');
}
APP.isMaximized = true;
module.isMaximized = true;
}
module.patchText = TextPatcher.create({
@@ -664,7 +667,8 @@ define([
console.log("Unlocking editor");
setEditable(true);
initializing = false;
Cryptpad.removeLoadingScreen();
Cryptpad.removeLoadingScreen(emitResize);
// Update the toolbar list:
// Add the current user in the metadata if he has edit rights
if (readOnly) { return; }