From d75d34abddaa6c4173c5cc67fbd3ed18283f03bc Mon Sep 17 00:00:00 2001 From: Omar Roth Date: Sun, 5 Aug 2018 07:38:43 -0500 Subject: [PATCH] Fix player parameters --- src/invidious/views/embed.ecr | 76 +++++++++++++++---------------- src/invidious/views/watch.ecr | 86 +++++++++++++++++------------------ 2 files changed, 81 insertions(+), 81 deletions(-) diff --git a/src/invidious/views/embed.ecr b/src/invidious/views/embed.ecr index 7c02e9e6..ab3f18fa 100644 --- a/src/invidious/views/embed.ecr +++ b/src/invidious/views/embed.ecr @@ -129,45 +129,45 @@ var player = videojs('player', options, function() { } } }); - - this.share(shareOptions); - - <% 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 %> - ] - }); - - 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 %> }); + +player.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 %> + ] +}); + +player.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 %> diff --git a/src/invidious/views/watch.ecr b/src/invidious/views/watch.ecr index 85ceafb6..af6ed5e9 100644 --- a/src/invidious/views/watch.ecr +++ b/src/invidious/views/watch.ecr @@ -138,51 +138,51 @@ var player = videojs('player', options, function() { } } }); - - this.share(shareOptions); - - <% 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 %> - ] - }); - - 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 preferences %> - this.volume(<%= preferences.volume.to_f / 100 %>); - this.playbackRate(<%= preferences.speed %>); - <% end %> }); +player.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 %> + ] +}); + +player.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 preferences %> +player.volume(<%= preferences.volume.to_f / 100 %>); +player.playbackRate(<%= preferences.speed %>); +<% end %> + function toggle(target) { body = target.parentNode.parentNode.children[1]; if (body.style.display === null || body.style.display === '') {