diff options
| author | Omar Roth <omarroth@hotmail.com> | 2018-06-08 14:38:59 -0500 |
|---|---|---|
| committer | Omar Roth <omarroth@hotmail.com> | 2018-06-08 14:38:59 -0500 |
| commit | d89ccc4d50156dbf63cb467ab9b782edf4a816f2 (patch) | |
| tree | 166ff771394cf904b432b4fa8a5194e675bc8b53 | |
| parent | e9e6bbd710011460962ce7d87ce66fbe63df3f64 (diff) | |
| download | invidious-d89ccc4d50156dbf63cb467ab9b782edf4a816f2.tar.gz invidious-d89ccc4d50156dbf63cb467ab9b782edf4a816f2.tar.bz2 invidious-d89ccc4d50156dbf63cb467ab9b782edf4a816f2.zip | |
Unify video/audio player
| -rw-r--r-- | src/views/player/audio.ecr | 5 | ||||
| -rw-r--r-- | src/views/player/video.ecr | 5 | ||||
| -rw-r--r-- | src/views/watch.ecr | 16 |
3 files changed, 11 insertions, 15 deletions
diff --git a/src/views/player/audio.ecr b/src/views/player/audio.ecr deleted file mode 100644 index 2130988d..00000000 --- a/src/views/player/audio.ecr +++ /dev/null @@ -1,5 +0,0 @@ -<audio style="width:100%" poster="<%= thumbnail %>" title="<%= HTML.escape(video.title) %>" id="player" class="video-js vjs-16-9" data-setup="{}" controls> - <% audio_streams.each_with_index do |fmt, i| %> - <source src="<%= fmt["url"] %>" type='<%= fmt["type"] %>' label="<%= fmt["bitrate"] %>k" selected="<%= i == 0 ? true : false %>"> - <% end %> -</audio>
\ No newline at end of file diff --git a/src/views/player/video.ecr b/src/views/player/video.ecr deleted file mode 100644 index 6e1ff5eb..00000000 --- a/src/views/player/video.ecr +++ /dev/null @@ -1,5 +0,0 @@ -<video style="width:100%" playsinline poster="<%= thumbnail %>" title="<%= HTML.escape(video.title) %>" id="player" class="video-js vjs-16-9" data-setup="{}" controls> - <% fmt_stream.each_with_index do |fmt, i| %> - <source src="<%= fmt["url"] %>" type='<%= fmt["type"] %>' label="<%= fmt["label"] %>" selected="<%= i == 0 ? true : false %>"> - <% end %> -</video>
\ No newline at end of file diff --git a/src/views/watch.ecr b/src/views/watch.ecr index 4545b697..dc8e4258 100644 --- a/src/views/watch.ecr +++ b/src/views/watch.ecr @@ -10,11 +10,17 @@ <% end %> <div class="h-box"> - <% if listen %> - <%= render "src/views/player/audio.ecr" %> - <% else %> - <%= render "src/views/player/video.ecr" %> - <% end %> + <video style="width:100%" playsinline poster="<%= thumbnail %>" title="<%= HTML.escape(video.title) %>" id="player" class="video-js vjs-16-9" data-setup="{}" controls> + <% if listen %> + <% audio_streams.each_with_index do |fmt, i| %> + <source src="<%= fmt["url"] %>" type='<%= fmt["type"] %>' label="<%= fmt["bitrate"] %>k" selected="<%= i == 0 ? true : false %>"> + <% end %> + <% else %> + <% fmt_stream.each_with_index do |fmt, i| %> + <source src="<%= fmt["url"] %>" type='<%= fmt["type"] %>' label="<%= fmt["label"] %>" selected="<%= i == 0 ? true : false %>"> + <% end %> + <% end %> + </video> </div> <script> |