From e62faf7c7b544020c185ccf04d2cca8e4ee52fe2 Mon Sep 17 00:00:00 2001 From: Caleb James DeLisle Date: Mon, 28 Aug 2017 11:22:57 +0200 Subject: [PATCH] Edge fix, always use async iframe onLoad rather than invoking it manually --- www/pad2/wysiwygarea-plugin.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/www/pad2/wysiwygarea-plugin.js b/www/pad2/wysiwygarea-plugin.js index c7f827000..7a0d08788 100644 --- a/www/pad2/wysiwygarea-plugin.js +++ b/www/pad2/wysiwygarea-plugin.js @@ -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 );