Merge branch 'feature/ie11-scroll-support' into develop

[SVCS-287] Closes: #295
CenterForOpenScience · Nov 6, 2017 · ee122ff · ee122ff
2 parents d6f20ba + 00517ba
commit ee122ff
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/mfr/extensions/jasp/templates/viewer.mako b/mfr/extensions/jasp/templates/viewer.mako
@@ -1,4 +1,4 @@
-<div style="word-wrap: break-word;" class="mfrViewer">
+<div style="word-wrap: break-word; overflow: auto" class="mfrViewer">
 ${body}
 </div>
 

diff --git a/mfr/server/static/js/mfr.js b/mfr/server/static/js/mfr.js
@@ -82,6 +82,7 @@
             self.pymParent.iframe.setAttribute('scrolling', 'yes');
             self.pymParent.iframe.setAttribute('horizontalscrolling', 'yes');
             self.pymParent.iframe.setAttribute('verticalscrolling', 'yes');
+            self.pymParent.iframe.setAttribute('overflow', 'scroll');
 
             self.pymParent.el.appendChild(self.spinner);
             $(self.pymParent.iframe).on('load', function () {

diff --git a/tests/extensions/jasp/test_renderer.py b/tests/extensions/jasp/test_renderer.py
@@ -68,7 +68,7 @@ class TestCodeJASPRenderer:
 
     def test_render_JASP(self, renderer):
         body = renderer.render()
-        assert '<div style="word-wrap: break-word;" class="mfrViewer">' in body
+        assert '<div style="word-wrap: break-word; overflow: auto" class="mfrViewer">' in body
 
     def test_render_JASP_not_a_zip_file(self, metadata, not_a_zip_file_path, url, assets_url, export_url):
         try: