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

config.example.js

@@ -35,6 +35,8 @@ module.exports = {
          *  domain which will serve your CryptPad instance.
          */
         "child-src blob: *",
+        // IE/Edge
+        "frame-src blob: *",
 
         "media-src * blob:",
 
@@ -62,7 +64,9 @@ module.exports = {
         /*  See above under 'contentSecurity' as to how these values should be
          *  configured for best effect.
          */
-         "child-src *",
+        "child-src *",
+        // IE/Edge
+        "frame-src *",
 
         // see the comment above in the 'contentSecurity' section
          "connect-src 'self' ws: wss:" + domain,

server.js

@@ -10,7 +10,13 @@ var NetfluxSrv = require('./node_modules/chainpad-server/NetfluxWebsocketSrv');
 var Package = require('./package.json');
 var Path = require("path");
 
-var config = require('./config');
+var config;
+try {
+    config = require('./config');
+} catch (e) {
+    console.log("You can customize the configuration by copying config.example.js to config.js");
+    config = require('./config.example');
+}
 var websocketPort = config.websocketPort || config.httpPort;
 var useSecureWebsockets = config.useSecureWebsockets || false;
 

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 );