Skip to content

Commit 1e6ecd6

Browse files
committed
Merge branch 'bug-fix/video-scrollbar' into develop
[SVCS-671] Closes: #318
2 parents 5838fd6 + 4e74723 commit 1e6ecd6

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

mfr/extensions/video/templates/viewer.mako

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
<style>
2+
## Setting margin and padding to 0 for body fixes the scrollbar flickering issue
3+
body {
4+
margin: 0;
5+
padding: 0;
6+
}
7+
</style>
8+
19
<video controls height="100%">
210
<source src="${url}">
311
Your browser does not support the video tag.
@@ -7,4 +15,4 @@
715
<script src="/static/js/mfr.child.js"></script>
816
<script>
917
window.pymChild.sendMessage('embed', 'embed-responsive-16by9');
10-
</script>
18+
</script>

tests/extensions/video/test_renderer.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import pytest
22

33
from mfr.core.provider import ProviderMetadata
4-
54
from mfr.extensions.video import VideoRenderer
65

76

87
@pytest.fixture
98
def metadata():
10-
return ProviderMetadata('test', '.mp4', 'text/plain', '1234', 'http://wb.osf.io/file/test.mp4?token=1234')
9+
return ProviderMetadata('test', '.mp4', 'text/plain', '1234',
10+
'http://wb.osf.io/file/test.mp4?token=1234')
1111

1212

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

4546
def test_render_video_file_required(self, renderer):
4647
assert renderer.file_required is False

0 commit comments

Comments
 (0)