Commit 2b252c6b1899e17c96db612658ca41eb1bb6570e
1 parent
da8e8094
Exists in
master
Adicionado suporte ao Safari.
Showing
3 changed files
with
38 additions
and
8 deletions
Show diff stats
@@ -0,0 +1,31 @@ | @@ -0,0 +1,31 @@ | ||
1 | +(function(videoHelper, $, undefined) { | ||
2 | + | ||
3 | + function _getSource(videoBaseUrl) { | ||
4 | + return '<source src="' + videoBaseUrl + '.webm" type="video/webm">' | ||
5 | + + '<source src="' + videoBaseUrl | ||
6 | + + '.mp4" type="video/mp4">Sem suporte a vídeos'; | ||
7 | + } | ||
8 | + | ||
9 | + function _controlVideo(elId, toPlay) { | ||
10 | + if ($(elId).length === 0) | ||
11 | + return; | ||
12 | + if (toPlay) { | ||
13 | + $(elId).get(0).play(); | ||
14 | + } else { | ||
15 | + $(elId).get(0).pause(); | ||
16 | + } | ||
17 | + } | ||
18 | + | ||
19 | + videoHelper.play = function(elId) { | ||
20 | + _controlVideo(elId, true); | ||
21 | + }; | ||
22 | + | ||
23 | + videoHelper.pause = function(elId) { | ||
24 | + _controlVideo(elId, false); | ||
25 | + }; | ||
26 | + | ||
27 | + videoHelper.getSource = function(videoBaseUrl) { | ||
28 | + return _getSource(videoBaseUrl); | ||
29 | + }; | ||
30 | + | ||
31 | +}(window.videoHelper = window.videoHelper || {}, jQuery)); |
view/js/validador.js
@@ -219,11 +219,11 @@ | @@ -219,11 +219,11 @@ | ||
219 | function _loadTaskInfo(task) { | 219 | function _loadTaskInfo(task) { |
220 | currentTaskId = task.id; | 220 | currentTaskId = task.id; |
221 | var signName = task.info.sign_name; | 221 | var signName = task.info.sign_name; |
222 | - var avatarVidLink = videosUrl + signName + '_AVATAR.webm'; | ||
223 | - var refVidLink = videosUrl + signName + '_REF.webm'; | 222 | + var baseAvatarVidUrl = videosUrl + signName + '_AVATAR'; |
223 | + var baseRefVidUrl = videosUrl + signName + '_REF'; | ||
224 | $('.sign-label').text(signName); | 224 | $('.sign-label').text(signName); |
225 | - $('#avatar-video').attr('src', avatarVidLink); | ||
226 | - $('#ref-video').attr('src', refVidLink); | 225 | + $('#avatar-video').html(videoHelper.getSource(baseAvatarVidUrl)); |
226 | + $('#ref-video').html(videoHelper.getSource(baseRefVidUrl)); | ||
227 | } | 227 | } |
228 | 228 | ||
229 | function _loadMainComponents() { | 229 | function _loadMainComponents() { |
view/templates/index.html
@@ -3,6 +3,7 @@ | @@ -3,6 +3,7 @@ | ||
3 | <script src="{{ server }}/js/external-libs/js.cookie.js"></script> | 3 | <script src="{{ server }}/js/external-libs/js.cookie.js"></script> |
4 | <script src="{{ server }}/js/helpers/pybossa-api-helper.js"></script> | 4 | <script src="{{ server }}/js/helpers/pybossa-api-helper.js"></script> |
5 | <script src="{{ server }}/js/helpers/load-html-helper.js"></script> | 5 | <script src="{{ server }}/js/helpers/load-html-helper.js"></script> |
6 | +<script src="{{ server }}/js/helpers/video-helper.js"></script> | ||
6 | <script src="{{ server }}/js/ranking.js"></script> | 7 | <script src="{{ server }}/js/ranking.js"></script> |
7 | <script src="{{ server }}/js/validador.js"></script> | 8 | <script src="{{ server }}/js/validador.js"></script> |
8 | 9 | ||
@@ -47,9 +48,8 @@ | @@ -47,9 +48,8 @@ | ||
47 | </h6> | 48 | </h6> |
48 | </div> | 49 | </div> |
49 | <div class="row"> | 50 | <div class="row"> |
50 | - <video id="avatar-video" src="" preload="metadata" | 51 | + <video id="avatar-video" preload="metadata" |
51 | class="video-body" autoplay loop controls> | 52 | class="video-body" autoplay loop controls> |
52 | - <source type="video/webm"> | ||
53 | </video> | 53 | </video> |
54 | </div> | 54 | </div> |
55 | <div id="avatar-radio-answers" class="row radio-options"> | 55 | <div id="avatar-radio-answers" class="row radio-options"> |
@@ -77,9 +77,8 @@ | @@ -77,9 +77,8 @@ | ||
77 | </h6> | 77 | </h6> |
78 | </div> | 78 | </div> |
79 | <div class="row"> | 79 | <div class="row"> |
80 | - <video id="ref-video" src="" preload="metadata" class="video-body" | 80 | + <video id="ref-video" preload="metadata" class="video-body" |
81 | autoplay loop controls> | 81 | autoplay loop controls> |
82 | - <source type="video/webm"> | ||
83 | </video> | 82 | </video> |
84 | </div> | 83 | </div> |
85 | <div id="ref-radio-answers" class="row radio-options"> | 84 | <div id="ref-radio-answers" class="row radio-options"> |