lug/invidious
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor formatting changes

Browse Source
This commit is contained in:
Omar Roth
2019-05-01 20:03:39 -05:00
parent 22b9bbe702
commit 1a9360ca75
31 changed files with 1406 additions and 1337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,24 +27,26 @@
<script>
<% if plid %>
function get_playlist(timeouts = 0) {
function get_playlist(plid, timeouts = 0) {
if (timeouts > 10) {
console.log("Failed to pull playlist");
console.log('Failed to pull playlist');
return;
}
var plid = "<%= plid %>"
if (plid.startsWith("RD")) {
var plid_url = "/api/v1/mixes/<%= plid %>?continuation=<%= video.id %>&format=html&hl=<%= env.get("preferences").as(Preferences).locale %>";
if (plid.startsWith('RD')) {
var plid_url = '/api/v1/mixes/' + plid +
'?continuation=<%= video.id %>' +
'&format=html&hl=<%= env.get("preferences").as(Preferences).locale %>';
} else {
var plid_url = "/api/v1/playlists/<%= plid %>?continuation=<%= video.id %>&format=html&hl=<%= env.get("preferences").as(Preferences).locale %>";
var plid_url = '/api/v1/playlists/' + plid +
'?continuation=<%= video.id %>' +
'&format=html&hl=<%= env.get("preferences").as(Preferences).locale %>';
}
var xhr = new XMLHttpRequest();
xhr.responseType = "json";
xhr.responseType = 'json';
xhr.timeout = 20000;
xhr.open("GET", plid_url, true);
xhr.open('GET', plid_url, true);
xhr.send();
xhr.onreadystatechange = function() {
@@ -52,18 +54,18 @@ function get_playlist(timeouts = 0) {
if (xhr.status == 200) {
if (xhr.response.nextVideo) {
player.on('ended', function() {
location.assign("/embed/"
+ xhr.response.nextVideo
+ "?list=<%= plid %>"
location.assign('/watch?v=' + xhr.response.nextVideo +
'&list=' + plid +
<% if params.listen != preferences.listen %>
+ "&listen=<%= params.listen %>"
'&listen=<%= params.listen %>' +
<% end %>
<% if params.autoplay || params.continue_autoplay %>
+ "&autoplay=1"
'&autoplay=1' +
<% end %>
<% if params.speed != preferences.speed %>
+ "&speed=<%= params.speed %>"
'&speed=<%= params.speed %>' +
<% end %>
''
);
});
}
@@ -72,29 +74,29 @@ function get_playlist(timeouts = 0) {
};
xhr.ontimeout = function() {
console.log("Pulling playlist timed out.");
get_playlist(timeouts + 1);
console.log('Pulling playlist timed out.');
get_playlist(plid, timeouts + 1);
};
}
get_playlist();
get_playlist('<%= plid %>');
<% elsif video_series %>
player.on('ended', function() {
location.assign("/embed/"
+ "<%= video_series.shift %>"
<% if !video_series.empty? %>
+ "?playlist=<%= video_series.join(",") %>"
<% end %>
<% if params.listen != preferences.listen %>
+ "&listen=<%= params.listen %>"
<% end %>
<% if params.autoplay || params.continue_autoplay %>
+ "&autoplay=1"
<% end %>
<% if params.speed != preferences.speed %>
+ "&speed=<%= params.speed %>"
<% end %>
);
location.assign('/embed/<%= video_series.shift %>' +
<% if !video_series.empty? %>
'?playlist=<%= video_series.join(",") %>' +
<% end %>
<% if params.listen != preferences.listen %>
'&listen=<%= params.listen %>' +
<% end %>
<% if params.autoplay || params.continue_autoplay %>
'&autoplay=1' +
<% end %>
<% if params.speed != preferences.speed %>
'&speed=<%= params.speed %>' +
<% end %>
''
);
});
<% end %>
</script>