From c6cb9876a7f63db608a1fab3d96baac6263a8200 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 20 Apr 2020 16:47:04 +0200
Subject: [PATCH] Fix secure iframe conflict with cba button

---
 www/common/common-ui-elements.js  | 6 ++++--
 www/common/inner/properties.js    | 2 +-
 www/common/sframe-common-outer.js | 6 +++---
 www/secureiframe/inner.js         | 3 ++-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 82e1f113d..049e26366 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1621,11 +1621,13 @@ define([
                         if (!data) {
                             return void UI.alert(Messages.autostore_notAvailable);
                         }
-                        sframeChan.query('Q_PROPERTIES_OPEN', null, function (err, data) {
+                        var metadataMgr = common.getMetadataMgr();
+                        sframeChan.query('Q_PROPERTIES_OPEN', {
+                            metadata: metadataMgr.getMetadata()
+                        }, function (err, data) {
                             if (!data || !data.cmd) { return; }
                             if (data.cmd === "UPDATE_METADATA") {
                                 if (!data.key) { return; }
-                                var metadataMgr = common.getMetadataMgr();
                                 var md = Util.clone(metadataMgr.getMetadata());
                                 md[data.key] = data.value;
                                 if (!data.value) { delete md[data.key]; }
diff --git a/www/common/inner/properties.js b/www/common/inner/properties.js
index 3dd3d972a..c82f51e49 100644
--- a/www/common/inner/properties.js
+++ b/www/common/inner/properties.js
@@ -59,7 +59,7 @@ define([
         if (owned && priv.app === 'code') {
             (function () {
                 var sframeChan = common.getSframeChannel();
-                var md = metadataMgr.getMetadata();
+                var md = (opts.data && opts.data.metadata) || {};
                 var div = h('div');
                 var hint = h('div.cp-app-prop-hint', Messages.cba_hint);
                 var $div = $(div);
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index 4fa73e109..8cddefb9f 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -1020,12 +1020,12 @@ define([
                     };
                     SecureModal.$iframe = $('<iframe>', {id: 'sbox-secure-iframe'}).appendTo($('body'));
                     SecureModal.modal = SecureIframe.create(config);
-                } else if (!cfg.hidden) {
+                }
+                if (!cfg.hidden) {
                     SecureModal.modal.refresh(cfg, function () {
                         SecureModal.$iframe.show();
                     });
-                }
-                if (cfg.hidden) {
+                } else {
                     SecureModal.$iframe.hide();
                     return;
                 }
diff --git a/www/secureiframe/inner.js b/www/secureiframe/inner.js
index dc8f5af3f..86b488fe4 100644
--- a/www/secureiframe/inner.js
+++ b/www/secureiframe/inner.js
@@ -74,9 +74,10 @@ define([
         };
 
         // Properties modal
-        create['properties'] = function () {
+        create['properties'] = function (data) {
             require(['/common/inner/properties.js'], function (Properties) {
                 Properties.getPropertiesModal(common, {
+                    data: data,
                     onClose: function () {
                         hideIframe();
                     }