KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2026-09-24 08:49:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reenabled frontpage rotation of lists

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2016-05-09 16:44:47 +02:00
parent 7742a8c9f8
commit 126204612f
5 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
static/dist/embed.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
static/dist/main.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
static/js/listeners.js
+2
View File
@@ -599,6 +599,8 @@ function onepage_load(){
window.initfp(); window.initfp();
}else { }else {
window.fromChannel = true; window.fromChannel = true;
frontpage = true;
window.initfp(); window.initfp();
} }
static/js/nochan.js
+2 -3
View File
@@ -137,8 +137,7 @@ var Nochan = {
//$(".room-namer").css("opacity", 1); //$(".room-namer").css("opacity", 1);
} }
},500); },500);
}else{ } else {
var img = new Image(); var img = new Image();
img.src = "/static/images/thumbnails/"+id+".jpg"; img.src = "/static/images/thumbnails/"+id+".jpg";
@@ -315,7 +314,7 @@ function initfp(){
socket.on('playlists', function(msg){ socket.on('playlists', function(msg){
$("#channels").empty(); $("#channels").empty();
frontpage = true;
Nochan.populate_channels(msg.channels); Nochan.populate_channels(msg.channels);
Nochan.set_viewers(msg.viewers); Nochan.set_viewers(msg.viewers);
static/js/player.js
+9 -6
View File
@@ -135,15 +135,18 @@ var Player = {
getTitle: function(titt, v) getTitle: function(titt, v)
{ {
var outPutWord = v > 1 ? "viewers" : "viewer"; var outPutWord = v > 1 ? "viewers" : "viewer";
var title = decodeURIComponent(titt); var title = decodeURIComponent(titt);
var elem = document.getElementById('song-title'); if(window.location.pathname != "/"){
var getTitleViews = document.getElementById('viewers'); var elem = document.getElementById('song-title');
var getTitleViews = document.getElementById('viewers');
document.title = title + " • Zöff / "+chan; elem.innerHTML = title;
elem.innerHTML = title; getTitleViews.innerHTML = v + " " + outPutWord;
getTitleViews.innerHTML = v + " " + outPutWord; elem.title = title + " • " + v + " " + outPutWord;
elem.title = title + " • " + v + " " + outPutWord; }
document.title = title + " • Zöff / "+chan;
}, },