web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix secure iframe conflict with cba button

Browse Source
This commit is contained in:
yflory 2020-04-20 16:47:04 +02:00
parent 49eacf752b
commit c6cb9876a7
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/common/common-ui-elements.js
View File

@ -1621,11 +1621,13 @@ define([
if (!data) { if (!data) {
return void UI.alert(Messages.autostore_notAvailable); 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 || !data.cmd) { return; }
if (data.cmd === "UPDATE_METADATA") { if (data.cmd === "UPDATE_METADATA") {
if (!data.key) { return; } if (!data.key) { return; }
var metadataMgr = common.getMetadataMgr();
var md = Util.clone(metadataMgr.getMetadata()); var md = Util.clone(metadataMgr.getMetadata());
md[data.key] = data.value; md[data.key] = data.value;
if (!data.value) { delete md[data.key]; } if (!data.value) { delete md[data.key]; }

2
www/common/inner/properties.js
View File

@ -59,7 +59,7 @@ define([
if (owned && priv.app === 'code') { if (owned && priv.app === 'code') {
(function () { (function () {
var sframeChan = common.getSframeChannel(); var sframeChan = common.getSframeChannel();
var md = metadataMgr.getMetadata(); var md = (opts.data && opts.data.metadata) || {};
var div = h('div'); var div = h('div');
var hint = h('div.cp-app-prop-hint', Messages.cba_hint); var hint = h('div.cp-app-prop-hint', Messages.cba_hint);
var $div = $(div); var $div = $(div);

6
www/common/sframe-common-outer.js
View File

@ -1020,12 +1020,12 @@ define([
}; };
SecureModal.$iframe = $('<iframe>', {id: 'sbox-secure-iframe'}).appendTo($('body')); SecureModal.$iframe = $('<iframe>', {id: 'sbox-secure-iframe'}).appendTo($('body'));
SecureModal.modal = SecureIframe.create(config); SecureModal.modal = SecureIframe.create(config);
} else if (!cfg.hidden) { }
if (!cfg.hidden) {
SecureModal.modal.refresh(cfg, function () { SecureModal.modal.refresh(cfg, function () {
SecureModal.$iframe.show(); SecureModal.$iframe.show();
}); });
} } else {
if (cfg.hidden) {
SecureModal.$iframe.hide(); SecureModal.$iframe.hide();
return; return;
} }

3
www/secureiframe/inner.js
View File

@ -74,9 +74,10 @@ define([
}; };
// Properties modal // Properties modal
create['properties'] = function () { create['properties'] = function (data) {
require(['/common/inner/properties.js'], function (Properties) { require(['/common/inner/properties.js'], function (Properties) {
Properties.getPropertiesModal(common, { Properties.getPropertiesModal(common, {
data: data,
onClose: function () { onClose: function () {
hideIframe(); hideIframe();
} }