Fix a cross origin frame issue with dropdowns

8 years ago · 757ae7a3ad
parent 24f66b7e3f
commit 757ae7a3ad
1 changed files with 7 additions and 3 deletions
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@ -1025,9 +1025,13 @@ define([
            e.stopPropagation();
            var state = $innerblock.is(':visible');
            $('.dropdown-bar-content').hide();
-            $('iframe').each(function (idx, ifrw) {
-                $(ifrw).contents().find('.dropdown-bar-content').hide();
-            });
+            try {
+                $('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) {
                $innerblock.hide();
                return;