Merge branch 'feature/open-pdf-links-in-new-tab' into develop

[SVCS-423] Closes: #273
CenterForOpenScience · Nov 14, 2017 · 9e9fc26 · 9e9fc26
2 parents dd5dd3e + 784f80f
commit 9e9fc26
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/mfr/extensions/pdf/templates/viewer.mako b/mfr/extensions/pdf/templates/viewer.mako
@@ -19,7 +19,7 @@ http://sourceforge.net/adobe/cmap/wiki/License/
 -->
 <html dir="ltr" mozdisallowselectionprint moznomarginboxes>
   <head>
-    <base href="${base}/web/">
+    <base href="${base}/web/" target="_blank">
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <meta name="google" content="notranslate">

diff --git a/mfr/server/static/js/mfr.js b/mfr/server/static/js/mfr.js
@@ -80,7 +80,7 @@
             self.pymParent.iframe.setAttribute('allowfullscreen', '');
             self.pymParent.iframe.setAttribute('webkitallowfullscreen', '');
             self.pymParent.iframe.setAttribute('scrolling', 'yes');
-            self.pymParent.iframe.setAttribute('sandbox', 'allow-scripts');
+            self.pymParent.iframe.setAttribute('sandbox', 'allow-scripts allow-popups');
 
             self.pymParent.el.appendChild(self.spinner);
             $(self.pymParent.iframe).on('load', function () {

diff --git a/tests/extensions/pdf/test_renderer.py b/tests/extensions/pdf/test_renderer.py
@@ -39,6 +39,6 @@ class TestPdfRenderer:
 
     def test_render_pdf(self, renderer, metadata, assets_url):
         body = renderer.render()
-        assert '<base href="{}/{}/web/">'.format(assets_url, 'pdf') in body
+        assert '<base href="{}/{}/web/" target="_blank">'.format(assets_url, 'pdf') in body
         assert '<div id="viewer" class="pdfViewer"></div>' in body
         assert 'DEFAULT_URL = \'{}\''.format(metadata.download_url) in body