From ab0f1f8d76ac68e1a5c3dde3b97a7e223a64d7f3 Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Tue, 5 Dec 2017 15:18:01 -0500
Subject: [PATCH] Changed iframe code, removed x-frame headers, js undefined
 reference error

---
 app/static/app/js/ModelView.jsx             | 2 +-
 app/static/app/js/components/SharePopup.jsx | 2 +-
 webodm/settings.py                          | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/static/app/js/ModelView.jsx b/app/static/app/js/ModelView.jsx
index 56a0aca6..d42ead0c 100644
--- a/app/static/app/js/ModelView.jsx
+++ b/app/static/app/js/ModelView.jsx
@@ -72,7 +72,7 @@ class ModelView extends React.Component {
 
   handleMouseClick(e){
     // Make sure the share popup closes
-    this.shareButton.hidePopup();
+    if (this.shareButton) this.shareButton.hidePopup();
   }
 
   componentDidMount() {
diff --git a/app/static/app/js/components/SharePopup.jsx b/app/static/app/js/components/SharePopup.jsx
index fb384de7..a267db3d 100644
--- a/app/static/app/js/components/SharePopup.jsx
+++ b/app/static/app/js/components/SharePopup.jsx
@@ -62,7 +62,7 @@ class SharePopup extends React.Component{
   render(){
     const shareLink = Utils.absoluteUrl(`/public/task/${this.state.task.id}/${this.props.linksTarget}/`);
     const iframeUrl = Utils.absoluteUrl(`public/task/${this.state.task.id}/iframe/${this.props.linksTarget}/`);
-    const iframeCode = `<iframe>${iframeUrl}</iframe>`;
+    const iframeCode = `<iframe scrolling="no" title="WebODM" width="61.8033%" height="360" frameBorder="0" src="${iframeUrl}"></iframe>`;
 
     return (<div onMouseDown={e => { e.stopPropagation(); }}
         className={"sharePopup popover in " + this.props.placement}>
diff --git a/webodm/settings.py b/webodm/settings.py
index 49e79d3c..5a050f7f 100644
--- a/webodm/settings.py
+++ b/webodm/settings.py
@@ -86,7 +86,6 @@ MIDDLEWARE = [
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'django.middleware.locale.LocaleMiddleware',
 ]