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

Fix broken share modal

Browse Source
This commit is contained in:
yflory 2020-04-20 18:14:38 +02:00
parent f2641bc0ee
commit 22a2b85fae
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1001,7 +1001,6 @@ define([
config.onAction = function (data) { config.onAction = function (data) {
if (typeof(SecureModal.cb) !== "function") { return; } if (typeof(SecureModal.cb) !== "function") { return; }
SecureModal.cb(data); SecureModal.cb(data);
SecureModal.$iframe.hide();
}; };
config.onClose = function () { config.onClose = function () {
SecureModal.$iframe.hide(); SecureModal.$iframe.hide();

3
www/secureiframe/inner.js
View File

@ -35,6 +35,7 @@ define([
var $body = $('body'); var $body = $('body');
var hideIframe = function () { var hideIframe = function () {
if (!displayed) { return; }
sframeChan.event('EV_SECURE_IFRAME_CLOSE'); sframeChan.event('EV_SECURE_IFRAME_CLOSE');
}; };
@ -68,7 +69,6 @@ define([
password: priv.password password: priv.password
} }
}); });
$('button.cancel').click(); // Close any existing alertify
_modal = UI.openCustomModal(modal); _modal = UI.openCustomModal(modal);
displayed = modal; displayed = modal;
}; };
@ -237,6 +237,7 @@ define([
if (!create[type]) { return; } if (!create[type]) { return; }
if (displayed && displayed.close) { displayed.close(); } if (displayed && displayed.close) { displayed.close(); }
else if (displayed && displayed.hide) { displayed.hide(); } else if (displayed && displayed.hide) { displayed.hide(); }
$('button.cancel').click(); // Close any existing alertify
displayed = undefined; displayed = undefined;
create[type](data); create[type](data);
}); });