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-28 11:48:02 +02:00
parent 6314487d98 e62faf7c7b
commit 5fbbaee2f5
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
www/pad2/wysiwygarea-plugin.js
View File

@@ -55,7 +55,12 @@ define(['/api/config'], function (ApiConfig) {
// Asynchronous iframe loading is only required in IE>8 and Gecko (other reasons probably).
// Do not use it on WebKit as it'll break the browser-back navigation.
var useOnloadEvent = ( CKEDITOR.env.ie && !CKEDITOR.env.edge ) || CKEDITOR.env.gecko;
var useOnloadEvent = ( CKEDITOR.env.ie && !CKEDITOR.env.edge ) || CKEDITOR.env.gecko;
// CryptPad
// This breaks Edge so lets use async all of the time
useOnloadEvent = true;
if ( useOnloadEvent )
iframe.on( 'load', onLoad );