From 5d499df39e5d7b09243257b1619b10818c6a23a2 Mon Sep 17 00:00:00 2001 From: yflory Date: Wed, 1 Feb 2017 11:37:19 +0100 Subject: [PATCH 1/2] Load jQuery before bootstrap --- customize.dist/about.html | 1 + customize.dist/contact.html | 1 + customize.dist/index.html | 1 + customize.dist/privacy.html | 1 + customize.dist/src/template.html | 1 + customize.dist/terms.html | 1 + 6 files changed, 6 insertions(+) diff --git a/customize.dist/about.html b/customize.dist/about.html index b03056297..1fd84db80 100644 --- a/customize.dist/about.html +++ b/customize.dist/about.html @@ -7,6 +7,7 @@ + diff --git a/customize.dist/contact.html b/customize.dist/contact.html index cd5c8002d..7a5f731f5 100644 --- a/customize.dist/contact.html +++ b/customize.dist/contact.html @@ -7,6 +7,7 @@ + diff --git a/customize.dist/index.html b/customize.dist/index.html index a317333d5..ba6412482 100644 --- a/customize.dist/index.html +++ b/customize.dist/index.html @@ -7,6 +7,7 @@ + diff --git a/customize.dist/privacy.html b/customize.dist/privacy.html index 0ca9f832f..ad9e4da33 100644 --- a/customize.dist/privacy.html +++ b/customize.dist/privacy.html @@ -7,6 +7,7 @@ + diff --git a/customize.dist/src/template.html b/customize.dist/src/template.html index 47a4fcca3..a738f5739 100644 --- a/customize.dist/src/template.html +++ b/customize.dist/src/template.html @@ -7,6 +7,7 @@ + diff --git a/customize.dist/terms.html b/customize.dist/terms.html index 184ddbb94..11c8dc385 100644 --- a/customize.dist/terms.html +++ b/customize.dist/terms.html @@ -7,6 +7,7 @@ + From 757ae7a3ad86e547ac01759e9cb6680e7a9f0a2b Mon Sep 17 00:00:00 2001 From: yflory Date: Wed, 1 Feb 2017 12:19:54 +0100 Subject: [PATCH 2/2] Fix a cross origin frame issue with dropdowns --- www/common/cryptpad-common.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js index cd600f5dd..1f11e2783 100644 --- 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;