diff --git a/.gitignore b/.gitignore index 772499f..223ed10 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ /.bundle /vendor/bundle/ /vendor/ruby/ +/public/assets/ # minimal Rails specific artifacts db/*.sqlite3 diff --git a/app/assets/javascripts/v_libras/requests/workflow.js b/app/assets/javascripts/v_libras/requests/workflow.js index 7a5442e..680e584 100644 --- a/app/assets/javascripts/v_libras/requests/workflow.js +++ b/app/assets/javascripts/v_libras/requests/workflow.js @@ -90,7 +90,7 @@ var VLibrasLocalization = function() { }, stop: function() { - _video[0].pause(); + /* _video[0].pause() */; } } }; \ No newline at end of file diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index ae43ecc..f23fed4 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -51,7 +51,7 @@ module ApplicationHelper options[:id] = id options[:class] = "video-js vjs-default skin #{classes}" - options[:preload] = 'auto' + options[:preload] = 'metadata' content_tag(:video, options) do if url.class == String diff --git a/app/views/v_libras/requests/_position_step.haml b/app/views/v_libras/requests/_position_step.haml index d5b75d9..3d21217 100644 --- a/app/views/v_libras/requests/_position_step.haml +++ b/app/views/v_libras/requests/_position_step.haml @@ -1,13 +1,7 @@ #position-step.wrapper .video_wrapper - %video.video-wizard - %source{src: "/system/videos/workflow/localizacao.mp4"} - %source{src: "/system/videos/workflow/localizacao.webm"} - Your browser does not support the video tag. - - =# html5_video_tag(['/system/videos/workflow/localizacao.mp4', '/system/videos/workflow/localizacao.webm'], - 'id') + = html5_video_tag("/system/videos/workflow/localizacao.mp4", 'id-4', 'video-wizard') :javascript var optionsPosition = { diff --git a/app/views/v_libras/requests/_service_step.haml b/app/views/v_libras/requests/_service_step.haml index 8b21dcd..ecbd80c 100644 --- a/app/views/v_libras/requests/_service_step.haml +++ b/app/views/v_libras/requests/_service_step.haml @@ -1,10 +1,7 @@ #service-step.wrapper .video_wrapper - %video.video-wizard - %source{src: "/system/videos/workflow/sub_audio.mp4"} - %source{src: "/system/videos/workflow/sub_audio.webm"} - Your browser does not support the video tag. + = html5_video_tag("/system/videos/workflow/sub_audio.mp4", 'id-2', 'video-wizard') .row-fluid.hide .span1.offset3 diff --git a/app/views/v_libras/requests/_size_step.haml b/app/views/v_libras/requests/_size_step.haml index 9016ca9..2faf1e9 100644 --- a/app/views/v_libras/requests/_size_step.haml +++ b/app/views/v_libras/requests/_size_step.haml @@ -1,12 +1,7 @@ #size-step.wrapper .video_wrapper - %video.video-wizard - %source{src: "/system/videos/workflow/tamanho.mp4"} - %source{src: "/system/videos/workflow/tamanho.webm"} - Your browser does not support the video tag. - - =# html5_video_tag("/video.mp4", 'id', 'video-wizard', :autoplay => 'autoplay') + = html5_video_tag("/system/videos/workflow/tamanho.mp4", 'id-3', 'video-wizard') :javascript diff --git a/app/views/v_libras/requests/_video_step.haml b/app/views/v_libras/requests/_video_step.haml index 3041bbc..4a680fd 100644 --- a/app/views/v_libras/requests/_video_step.haml +++ b/app/views/v_libras/requests/_video_step.haml @@ -1,10 +1,7 @@ #video-step.wrapper .video_wrapper - %video.video-wizard{:autoplay => 'autoplay'} - %source{src: "/system/videos/workflow/sub_audio.mp4"} - %source{src: "/system/videos/workflow/sub_audio.webm"} - Your browser does not support the video tag. + = html5_video_tag("/system/videos/workflow/sub_audio.mp4", 'id-1', 'video-wizard', :autoplay => 'autoplay') .row-fluid .span1.offset3 @@ -17,7 +14,7 @@ :javascript var optionsVideo = { video: { width: 940, height: 530 }, - buttons: [] + buttons: [ ] }; var VLibrasVideo = new VLibrasLocalization(); -- libgit2 0.21.2