knotteye
/
satyr
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 5 Wiki Activity

merge frontend-improvments #18

Merged
knotteye merged 2 commits from frontend-improvments into develop 2021-01-08 16:18:05 -06:00
Conversation 0 Commits 2 Files Changed 2
2 changed files with 52 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
site/index.js
View File

@ -167,7 +167,7 @@ function handleLoad() {
function modifyLinks() { function modifyLinks() {
for (var ls = document.links, numLinks = ls.length, i=0; i<numLinks; i++){ for (var ls = document.links, numLinks = ls.length, i=0; i<numLinks; i++){
if(ls[i].href.indexOf(location.protocol+'//'+location.host) !== -1) { if(ls[i].href.indexOf(location.protocol+'//'+location.host) !== -1 && ls[i].href.match(new RegExp(/\/\w+\.\w+$/)) === null) {
//should be a regular link //should be a regular link
ls[i].setAttribute('onclick', 'return internalLink(\"'+ls[i].href.substring((location.protocol+'//'+location.host).length)+'\")'); ls[i].setAttribute('onclick', 'return internalLink(\"'+ls[i].href.substring((location.protocol+'//'+location.host).length)+'\")');
} }
@ -190,6 +190,8 @@ async function initPlayer(usr) {
shaka.polyfill.installAll(); shaka.polyfill.installAll();
shakaPolyFilled = true; shakaPolyFilled = true;
} }
var live = JSON.parse(await makeRequest("GET", "/api/"+usr+"/config")).live;
if(live){
// Create a Player instance. // Create a Player instance.
const video = document.getElementById('video'); const video = document.getElementById('video');
const player = new shaka.Player(video); const player = new shaka.Player(video);
@ -212,6 +214,9 @@ async function initPlayer(usr) {
// onError is executed if the asynchronous load fails. // onError is executed if the asynchronous load fails.
onError(e); onError(e);
} }
} else {
setTimeout(initPlayer, 5000, usr);
}
} }
function onErrorEvent(event) { function onErrorEvent(event) {

6
templates/user.njk
View File

@ -5,10 +5,13 @@
shakaPolyFilled = false; shakaPolyFilled = false;
var manifestUri = document.location.protocol+'//'+document.location.host+'/live/{{ username }}/index.mpd'; var manifestUri = document.location.protocol+'//'+document.location.host+'/live/{{ username }}/index.mpd';
async function initPlayer() { async function initPlayer() {
console.log('Trying to initialize player.');
if(!shakaPolyFilled){ if(!shakaPolyFilled){
shaka.polyfill.installAll(); shaka.polyfill.installAll();
shakaPolyFilled = true; shakaPolyFilled = true;
} }
var live = JSON.parse(await makeRequest("GET", "/api/{{ username }}/config")).live;
if(live){
// Create a Player instance. // Create a Player instance.
const video = document.getElementById('video'); const video = document.getElementById('video');
const player = new shaka.Player(video); const player = new shaka.Player(video);
@ -31,6 +34,9 @@ async function initPlayer() {
// onError is executed if the asynchronous load fails. // onError is executed if the asynchronous load fails.
onError(e); onError(e);
} }
} else {
setTimeout(initPlayer, 5000);
}
} }
function onErrorEvent(event) { function onErrorEvent(event) {