iv-org
/
invidious
mirror of https://github.com/iv-org/invidious.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move player options into initialization

This commit is contained in:
Omar Roth 2018-08-03 19:51:29 -05:00
parent 7128881a38
commit 3398a9fe6b
2 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/invidious/views/embed.ecr
View File

@ -130,12 +130,11 @@ var player = videojs('player', options, function() {
} }
} }
}); });
});
player.share(shareOptions); this.share(shareOptions);
<%- if video_start > 0 || video_end > 0 -%> <% if video_start > 0 || video_end > 0 %>
player.markers({ this.markers({
onMarkerReached: function(marker) { onMarkerReached: function(marker) {
if (marker.text === 'End') { if (marker.text === 'End') {
if (player.loop()) { if (player.loop()) {
@ -147,18 +146,18 @@ player.markers({
}, },
markers: [ markers: [
{time: <%= video_start %>, text: 'Start'}, {time: <%= video_start %>, text: 'Start'},
<%- if video_end < 0 -%> <% if video_end < 0 %>
{time: <%= video.info["length_seconds"].to_f - 0.5 %>, text: 'End'} {time: <%= video.info["length_seconds"].to_f - 0.5 %>, text: 'End'}
<%- else -%> <% else %>
{time: <%= video_end %>, text: 'End'} {time: <%= video_end %>, text: 'End'}
<%- end -%> <% end %>
] ]
}); });
player.currentTime(<%= video_start %>); this.currentTime(<%= video_start %>);
<%- end -%> <% end %>
<%- if !listen -%> <% if !listen %>
var currentSources = player.currentSources(); var currentSources = player.currentSources();
for ( var i = 0; i < currentSources.length; i++ ) { for ( var i = 0; i < currentSources.length; i++ ) {
if (player.canPlayType(currentSources[i]['type'].split(';')[0]) === '') { if (player.canPlayType(currentSources[i]['type'].split(';')[0]) === '') {
@ -168,7 +167,8 @@ for ( var i = 0; i < currentSources.length; i++ ) {
} }
player.src(currentSources); player.src(currentSources);
<%- end -%> <% end %>
});
</script> </script>
</body> </body>

20
src/invidious/views/watch.ecr
View File

@ -40,7 +40,7 @@
<div class="h-box"> <div class="h-box">
<video style="width:100%" playsinline poster="<%= thumbnail %>" title="<%= HTML.escape(video.title) %>" <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 autoplay %>autoplay<% end %>
<% if video_loop %>loop<% end %> <% if video_loop %>loop<% end %>
controls> controls>
@ -138,17 +138,11 @@ var player = videojs('player', options, function() {
} }
} }
}); });
});
player.share(shareOptions); this.share(shareOptions);
<% if preferences %>
player.volume(<%= preferences.volume.to_f / 100 %>);
player.playbackRate(<%= preferences.speed %>);
<% end %>
<% if video_start > 0 || video_end > 0 %> <% if video_start > 0 || video_end > 0 %>
player.markers({ this.markers({
onMarkerReached: function(marker) { onMarkerReached: function(marker) {
if (marker.text === 'End') { if (marker.text === 'End') {
if (player.loop()) { if (player.loop()) {
@ -168,7 +162,7 @@ player.markers({
] ]
}); });
player.currentTime(<%= video_start %>); this.currentTime(<%= video_start %>);
<% end %> <% end %>
<% if !listen %> <% if !listen %>
@ -183,6 +177,12 @@ for ( var i = 0; i < currentSources.length; i++ ) {
player.src(currentSources); player.src(currentSources);
<% end %> <% end %>
<% if preferences %>
this.volume(<%= preferences.volume.to_f / 100 %>);
this.playbackRate(<%= preferences.speed %>);
<% end %>
});
function toggle(target) { function toggle(target) {
body = target.parentNode.parentNode.children[1]; body = target.parentNode.parentNode.children[1];
if (body.style.display === null || body.style.display === '') { if (body.style.display === null || body.style.display === '') {