[DEMAD-104] Video player

AyuntamientoMadrid · Dec 18, 2020 · 83615ce · 83615ce
1 parent 6b1e411
commit 83615ce
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -63,6 +63,7 @@ gem 'starrr'
 gem 'paperclip-ffmpeg'
 gem 'paperclip-av-transcoder'
 gem "cocaine"
+gem 'jw_player_helper'
 
 source "https://rails-assets.org" do
   gem "rails-assets-leaflet"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -250,6 +250,7 @@ GEM
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
     json (2.3.1)
+    jw_player_helper (0.0.1)
     jwt (1.5.6)
     kaminari (1.1.1)
       activesupport (>= 4.1.0)
@@ -594,6 +595,7 @@ DEPENDENCIES
   jquery-fileupload-rails
   jquery-rails (~> 4.3.3)
   jquery-ui-rails (~> 6.0.1)
+  jw_player_helper
   kaminari (~> 1.1.1)
   knapsack_pro (~> 1.1.0)
   launchy (~> 2.4.3)

diff --git a/app/assets/javascripts/imageable.js.coffee b/app/assets/javascripts/imageable.js.coffee
@@ -121,11 +121,19 @@ App.Imageable =
     $(data.errorContainer).append(errors)
 
   setPreview: (data) ->
+    # video_preview = "<div class='small-12 column text-center image-preview'><video width='320' height='240' controls><source src='#{data.result.attachment_url}' class='cached-image' type='video/mp4'>No se muestra el video</video></div>"
+    video_preview = "<video id='player' playsinline controls><source src='#{data.result.attachment_url}' type='video/mp4'></video>"
     image_preview = "<div class='small-12 column text-center image-preview'><figure><img src='#{data.result.attachment_url}' class='cached-image'></figure></div>"
     if $(data.preview).length > 0
-      $(data.preview).replaceWith(image_preview)
+      if "mp4".indexOf(data.result.filename)
+        $(data.preview).replaceWith(video_preview)
+      else
+        $(data.preview).replaceWith(image_preview)
     else
-      $(image_preview).insertBefore($(data.wrapper).find(".attachment-actions"))
+      if "mp4".indexOf(data.result.filename)
+        $(video_preview).insertBefore($(data.wrapper).find(".attachment-actions"))
+      else
+        $(image_preview).insertBefore($(data.wrapper).find(".attachment-actions"))
       data.preview = $(data.wrapper).find(".image-preview")
 
   doDeleteCachedAttachmentRequest: (url, data) ->

diff --git a/app/views/welcome/_header.html.erb b/app/views/welcome/_header.html.erb
@@ -1,3 +1,4 @@
+<%= javascript_include_tag 'swfobject' %>
 <% if header.present? %>
   <hr style="max-width: 100%">
   <div>