From 40415ce99bc237921fd8583aaa66cd35afa73b96 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 20 Sep 2023 15:37:51 +0200
Subject: [PATCH] Fix issue introduced with b78ec996

---
 www/common/sframe-common-outer.js |  5 +----
 www/secureiframe/main.js          | 28 +++++++++++-----------------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index afd65b888..d4b9816f4 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -1559,15 +1559,12 @@ define([
                     SecureModal.$iframe = $('<iframe>', {id: 'sbox-secure-iframe'}).appendTo($('body'));
                     SecureModal.modal = SecureIframe.create(config);
                 }
+                setDocumentTitle();
                 if (!cfg.hidden) {
                     SecureModal.modal.refresh(cfg, function () {
                         SecureModal.$iframe.show();
-                        setDocumentTitle();
                     });
                 } else {
-                    SecureModal.modal.refresh(cfg, function () {
-                        setDocumentTitle();
-                    });
                     SecureModal.$iframe.hide();
                     return;
                 }
diff --git a/www/secureiframe/main.js b/www/secureiframe/main.js
index efd4c2f44..63197653c 100644
--- a/www/secureiframe/main.js
+++ b/www/secureiframe/main.js
@@ -4,11 +4,12 @@ define([
     '/api/config',
     'jquery',
     '/common/requireconfig.js',
+    '/common/common-util.js',
     '/customize/messages.js',
-], function (nThen, ApiConfig, $, RequireConfig, Messages) {
+], function (nThen, ApiConfig, $, RequireConfig, Util, Messages) {
     var requireConfig = RequireConfig();
 
-    var ready = false;
+    var readyEvt = Util.mkEvent(true);
 
     var create = function (config) {
         // Loaded in load #2
@@ -169,27 +170,20 @@ define([
                 });
 
                 sframeChan.onReady(function () {
-                    if (ready === true) { return; }
-                    if (typeof ready === "function") {
-                        ready();
-                    }
-                    ready = true;
+                    readyEvt.fire();
                 });
             });
         });
         var refresh = function (data, cb) {
-            if (!ready) {
-                ready = function () {
-                    refresh(data, cb);
-                };
-                return;
-            }
-            sframeChan.event('EV_REFRESH', data);
-            cb();
+            readyEvt.reg(() => {
+                sframeChan.event('EV_REFRESH', data);
+                cb();
+            });
         };
         var setTitle = function (title) {
-            if (!sframeChan) { return; }
-            sframeChan.event('EV_IFRAME_TITLE', title);
+            readyEvt.reg(() => {
+                sframeChan.event('EV_IFRAME_TITLE', title);
+            });
         };
         return {
             refresh: refresh,