diff options
| -rw-r--r-- | src/invidious/views/embed.ecr | 72 | ||||
| -rw-r--r-- | src/invidious/views/watch.ecr | 84 |
2 files changed, 78 insertions, 78 deletions
diff --git a/src/invidious/views/embed.ecr b/src/invidious/views/embed.ecr index 8da16674..b28ce5f8 100644 --- a/src/invidious/views/embed.ecr +++ b/src/invidious/views/embed.ecr @@ -92,7 +92,7 @@ var shareOptions = { }; var player = videojs('player', options, function() { - this.hotkeys({ + this.hotkeys({ volumeStep: 0.1, seekStep: 5, enableModifiersForNumbers: false, @@ -130,45 +130,45 @@ var player = videojs('player', options, function() { } } }); -}); -player.share(shareOptions); + this.share(shareOptions); -<%- if video_start > 0 || video_end > 0 -%> -player.markers({ - onMarkerReached: function(marker) { - if (marker.text === 'End') { - if (player.loop()) { - player.markers.prev('Start'); - } else { - player.pause(); - } - } - }, - markers: [ - {time: <%= video_start %>, text: 'Start'}, - <%- if video_end < 0 -%> - {time: <%= video.info["length_seconds"].to_f - 0.5 %>, text: 'End'} - <%- else -%> - {time: <%= video_end %>, text: 'End'} - <%- end -%> - ] -}); + <% if video_start > 0 || video_end > 0 %> + this.markers({ + onMarkerReached: function(marker) { + if (marker.text === 'End') { + if (player.loop()) { + player.markers.prev('Start'); + } else { + player.pause(); + } + } + }, + markers: [ + {time: <%= video_start %>, text: 'Start'}, + <% if video_end < 0 %> + {time: <%= video.info["length_seconds"].to_f - 0.5 %>, text: 'End'} + <% else %> + {time: <%= video_end %>, text: 'End'} + <% end %> + ] + }); -player.currentTime(<%= video_start %>); -<%- end -%> + this.currentTime(<%= video_start %>); + <% end %> -<%- if !listen -%> -var currentSources = player.currentSources(); -for ( var i = 0; i < currentSources.length; i++ ) { - if (player.canPlayType(currentSources[i]['type'].split(';')[0]) === '') { - currentSources.splice(i); - i--; - } -} - -player.src(currentSources); -<%- end -%> + <% if !listen %> + var currentSources = player.currentSources(); + for ( var i = 0; i < currentSources.length; i++ ) { + if (player.canPlayType(currentSources[i]['type'].split(';')[0]) === '') { + currentSources.splice(i); + i--; + } + } + + player.src(currentSources); + <% end %> +}); </script> </body> diff --git a/src/invidious/views/watch.ecr b/src/invidious/views/watch.ecr index 3d165482..3b72f82a 100644 --- a/src/invidious/views/watch.ecr +++ b/src/invidious/views/watch.ecr @@ -40,7 +40,7 @@ <div class="h-box"> <video style="width:100%" playsinline poster="<%= thumbnail %>" title="<%= HTML.escape(video.title) %>" - id="player" class="video-js" data-setup="{}" + id="player" class="video-js" <% if autoplay %>autoplay<% end %> <% if video_loop %>loop<% end %> controls> @@ -100,7 +100,7 @@ var shareOptions = { }; var player = videojs('player', options, function() { - this.hotkeys({ + this.hotkeys({ volumeStep: 0.1, seekStep: 5, enableModifiersForNumbers: false, @@ -138,50 +138,50 @@ var player = videojs('player', options, function() { } } }); -}); - -player.share(shareOptions); -<% if preferences %> -player.volume(<%= preferences.volume.to_f / 100 %>); -player.playbackRate(<%= preferences.speed %>); -<% end %> - -<% if video_start > 0 || video_end > 0 %> -player.markers({ - onMarkerReached: function(marker) { - if (marker.text === 'End') { - if (player.loop()) { - player.markers.prev('Start'); - } else { - player.pause(); - } - } - }, - markers: [ - {time: <%= video_start %>, text: 'Start'}, - <% if video_end < 0 %> - {time: <%= video.info["length_seconds"].to_f - 0.5 %>, text: 'End'} - <% else %> - {time: <%= video_end %>, text: 'End'} - <% end %> - ] -}); + this.share(shareOptions); -player.currentTime(<%= video_start %>); -<% end %> + <% if video_start > 0 || video_end > 0 %> + this.markers({ + onMarkerReached: function(marker) { + if (marker.text === 'End') { + if (player.loop()) { + player.markers.prev('Start'); + } else { + player.pause(); + } + } + }, + markers: [ + {time: <%= video_start %>, text: 'Start'}, + <% if video_end < 0 %> + {time: <%= video.info["length_seconds"].to_f - 0.5 %>, text: 'End'} + <% else %> + {time: <%= video_end %>, text: 'End'} + <% end %> + ] + }); -<% if !listen %> -var currentSources = player.currentSources(); -for ( var i = 0; i < currentSources.length; i++ ) { - if (player.canPlayType(currentSources[i]['type'].split(';')[0]) === '') { - currentSources.splice(i); - i--; - } -} + this.currentTime(<%= video_start %>); + <% end %> -player.src(currentSources); -<% end %> + <% if !listen %> + var currentSources = player.currentSources(); + for ( var i = 0; i < currentSources.length; i++ ) { + if (player.canPlayType(currentSources[i]['type'].split(';')[0]) === '') { + currentSources.splice(i); + i--; + } + } + + player.src(currentSources); + <% end %> + + <% if preferences %> + this.volume(<%= preferences.volume.to_f / 100 %>); + this.playbackRate(<%= preferences.speed %>); + <% end %> +}); function toggle(target) { body = target.parentNode.parentNode.children[1]; |