From 1044531806173a1a0ce39f41af6734196b7d966e Mon Sep 17 00:00:00 2001
From: Caleb James DeLisle <cjd@cjdns.fr>
Date: Wed, 30 Aug 2017 11:04:52 +0200
Subject: [PATCH] Fix Safari iframe size issue

---
 www/pad/inner.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/www/pad/inner.js b/www/pad/inner.js
index 48c901d69..28bfd6fa0 100644
--- a/www/pad/inner.js
+++ b/www/pad/inner.js
@@ -773,11 +773,18 @@ define([
             }
             // Used in ckeditor-config.js
             Ckeditor.CRYPTPAD_URLARGS = ApiConfig.requireConf.urlArgs;
-            editor = Ckeditor.replace('editor1', {
+            module.ckeditor = editor = Ckeditor.replace('editor1', {
                 customConfig: '/customize/ckeditor-config.js',
             });
             editor.on('instanceReady', waitFor());
         }).nThen(function (/*waitFor*/) {
+            if (Ckeditor.env.safari) {
+                var fixIframe = function () {
+                    $('iframe.cke_wysiwyg_frame').height($('#cke_1_contents').height());
+                };
+                $(window).resize(fixIframe);
+                fixIframe();
+            }
             Links.addSupportForOpeningLinksInNewTab(Ckeditor)({editor: editor});
             Cryptpad.onError(function (info) {
                 if (info && info.type === "store") {