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

Fix a cross origin frame issue with dropdowns

Browse Source
This commit is contained in:
yflory 2017-02-01 12:19:54 +01:00
parent 24f66b7e3f
commit 757ae7a3ad
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
www/common/cryptpad-common.js
View File

@ -1025,9 +1025,13 @@ define([
e.stopPropagation(); e.stopPropagation();
var state = $innerblock.is(':visible'); var state = $innerblock.is(':visible');
$('.dropdown-bar-content').hide(); $('.dropdown-bar-content').hide();
$('iframe').each(function (idx, ifrw) { try {
$(ifrw).contents().find('.dropdown-bar-content').hide(); $('iframe').each(function (idx, ifrw) {
}); $(ifrw).contents().find('.dropdown-bar-content').hide();
});
} catch (e) {
// empty try catch in case this iframe is problematic (cross-origin)
}
if (state) { if (state) {
$innerblock.hide(); $innerblock.hide();
return; return;