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

This commit is contained in:
ansuz committed 2017-08-28 11:48:02 +02:00
commit 5fbbaee2f5
3 files changed
+18 -3

No files matched your search

+6 -1
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 );