Upstream sync

2020-07-27 10:17:56 +00:00
parent 8f13589c55
commit 9c3fac4ab9
37 changed files with 743 additions and 64 deletions
--- a/app/assets/javascripts/channels/broadcasts.coffee.erb
+++ b/app/assets/javascripts/channels/broadcasts.coffee.erb
@@ -21,10 +21,11 @@ $(document).on "turbolinks:load", ->

    refreshBroadcastVideo: (data) ->
      $("#broadcast_updates").html data.status_content
-      stream_selected = $("#broadcast_video").attr('video-type') == 'stream';
+      stream_selected = $("#broadcast_video").data('videoType') == 'stream';
      if data.streamer_status == 'recording' && data.status == 'active' && stream_selected
        $("#broadcast_video").html data.video_content
        new (Clappr.Player)(
+          <%= "baseUrl: 'http://cdn.clappr.io/latest'," if Rails.env.test? %>
          parentId: '#broadcast_video'
          source: data.full_live_stream_playback_url
          width: '100%',