Download as
Browse Code »

Commit 5b044bd81120800cf51397ddb3bc94ad6e8e2db5

Authored by Fernando Brito
1 parent 89a073e5
Exists in master and in 2 other branches v2, wikilibras

Video JS on workflow

Showing 7 changed files with 8 additions and 24 deletions   Show diff stats
@@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
14 /.bundle 14 /.bundle
15 /vendor/bundle/ 15 /vendor/bundle/
16 /vendor/ruby/ 16 /vendor/ruby/
  17 +/public/assets/
17 18
18 # minimal Rails specific artifacts 19 # minimal Rails specific artifacts
19 db/*.sqlite3 20 db/*.sqlite3
app/assets/javascripts/v_libras/requests/workflow.js
  Diff comments   View file @5b044bd
@@ -90,7 +90,7 @@ var VLibrasLocalization = function() { @@ -90,7 +90,7 @@ var VLibrasLocalization = function() {
90 }, 90 },
91 91
92 stop: function() { 92 stop: function() {
93 - _video[0].pause(); 93 + /* _video[0].pause() */;
94 } 94 }
95 } 95 }
96 }; 96 };
97 \ No newline at end of file 97 \ No newline at end of file
app/helpers/application_helper.rb
  Diff comments   View file @5b044bd
@@ -51,7 +51,7 @@ module ApplicationHelper @@ -51,7 +51,7 @@ module ApplicationHelper
51 51
52 options[:id] = id 52 options[:id] = id
53 options[:class] = "video-js vjs-default skin #{classes}" 53 options[:class] = "video-js vjs-default skin #{classes}"
54 - options[:preload] = 'auto' 54 + options[:preload] = 'metadata'
55 55
56 content_tag(:video, options) do 56 content_tag(:video, options) do
57 if url.class == String 57 if url.class == String
app/views/v_libras/requests/_position_step.haml
  Diff comments   View file @5b044bd
1 #position-step.wrapper 1 #position-step.wrapper
2 .video_wrapper 2 .video_wrapper
3 3
4 - %video.video-wizard  
5 - %source{src: "/system/videos/workflow/localizacao.mp4"}  
6 - %source{src: "/system/videos/workflow/localizacao.webm"}  
7 - Your browser does not support the video tag.  
8 -  
9 - =# html5_video_tag(['/system/videos/workflow/localizacao.mp4', '/system/videos/workflow/localizacao.webm'],  
10 - 'id') 4 + = html5_video_tag("/system/videos/workflow/localizacao.mp4", 'id-4', 'video-wizard')
11 5
12 :javascript 6 :javascript
13 var optionsPosition = { 7 var optionsPosition = {
app/views/v_libras/requests/_service_step.haml
  Diff comments   View file @5b044bd
1 #service-step.wrapper 1 #service-step.wrapper
2 .video_wrapper 2 .video_wrapper
3 3
4 - %video.video-wizard  
5 - %source{src: "/system/videos/workflow/sub_audio.mp4"}  
6 - %source{src: "/system/videos/workflow/sub_audio.webm"}  
7 - Your browser does not support the video tag. 4 + = html5_video_tag("/system/videos/workflow/sub_audio.mp4", 'id-2', 'video-wizard')
8 5
9 .row-fluid.hide 6 .row-fluid.hide
10 .span1.offset3 7 .span1.offset3
app/views/v_libras/requests/_size_step.haml
  Diff comments   View file @5b044bd
1 #size-step.wrapper 1 #size-step.wrapper
2 .video_wrapper 2 .video_wrapper
3 3
4 - %video.video-wizard  
5 - %source{src: "/system/videos/workflow/tamanho.mp4"}  
6 - %source{src: "/system/videos/workflow/tamanho.webm"}  
7 - Your browser does not support the video tag.  
8 -  
9 - =# html5_video_tag("/video.mp4", 'id', 'video-wizard', :autoplay => 'autoplay') 4 + = html5_video_tag("/system/videos/workflow/tamanho.mp4", 'id-3', 'video-wizard')
10 5
11 6
12 :javascript 7 :javascript
app/views/v_libras/requests/_video_step.haml
  Diff comments   View file @5b044bd
1 #video-step.wrapper 1 #video-step.wrapper
2 .video_wrapper 2 .video_wrapper
3 3
4 - %video.video-wizard{:autoplay => 'autoplay'}  
5 - %source{src: "/system/videos/workflow/sub_audio.mp4"}  
6 - %source{src: "/system/videos/workflow/sub_audio.webm"}  
7 - Your browser does not support the video tag. 4 + = html5_video_tag("/system/videos/workflow/sub_audio.mp4", 'id-1', 'video-wizard', :autoplay => 'autoplay')
8 5
9 .row-fluid 6 .row-fluid
10 .span1.offset3 7 .span1.offset3
@@ -17,7 +14,7 @@ @@ -17,7 +14,7 @@
17 :javascript 14 :javascript
18 var optionsVideo = { 15 var optionsVideo = {
19 video: { width: 940, height: 530 }, 16 video: { width: 940, height: 530 },
20 - buttons: [] 17 + buttons: [ ]
21 }; 18 };
22 19
23 var VLibrasVideo = new VLibrasLocalization(); 20 var VLibrasVideo = new VLibrasLocalization();