Skip to content

Commit

Permalink
Merge branch 'bug-fix/video-scrollbar' into develop
Browse files Browse the repository at this point in the history
[SVCS-671]
Closes: #318
  • Loading branch information
cslzchen committed Apr 5, 2018
2 parents 5838fd6 + 4e74723 commit 1e6ecd6
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
10 changes: 9 additions & 1 deletion mfr/extensions/video/templates/viewer.mako
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
<style>
## Setting margin and padding to 0 for body fixes the scrollbar flickering issue
body {
margin: 0;
padding: 0;
}
</style>

<video controls height="100%">
<source src="${url}">
Your browser does not support the video tag.
Expand All @@ -7,4 +15,4 @@
<script src="/static/js/mfr.child.js"></script>
<script>
window.pymChild.sendMessage('embed', 'embed-responsive-16by9');
</script>
</script>
5 changes: 3 additions & 2 deletions tests/extensions/video/test_renderer.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import pytest

from mfr.core.provider import ProviderMetadata

from mfr.extensions.video import VideoRenderer


@pytest.fixture
def metadata():
return ProviderMetadata('test', '.mp4', 'text/plain', '1234', 'http://wb.osf.io/file/test.mp4?token=1234')
return ProviderMetadata('test', '.mp4', 'text/plain', '1234',
'http://wb.osf.io/file/test.mp4?token=1234')


@pytest.fixture
Expand Down Expand Up @@ -41,6 +41,7 @@ def test_render_video(self, renderer, url):
body = renderer.render()
assert '<video controls' in body
assert 'src="{}"'.format(metadata().download_url) in body
assert '<style>body{margin:0;padding:0;}</style>' in ''.join(body.split())

def test_render_video_file_required(self, renderer):
assert renderer.file_required is False
Expand Down

0 comments on commit 1e6ecd6

Please sign in to comment.