KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-12-07 20:18:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Readded viewers, and removed fullscreenbutton on embed

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2016-01-27 15:36:40 +01:00
parent 5672f23a77
commit a9a7709b30
7 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
static/css/embed.css
View File

@@ -180,11 +180,11 @@
font-family:"Roboto", sans-serif;
font-weight:300;
margin-left:15px;
margin-right:5px;
}
#viewers{
float: right;
display:none;
}
#play, #pause, #volume-button, #fullscreen
@@ -200,7 +200,7 @@
left: 10px;
margin: 13px auto;
height:5px;
width: 75px;
width: 60px;
/*background-color:rgba(0, 0, 0, 0.5);*/
background:rgba(0, 0, 0, 0.5) 50% 50% repeat-x;
border: none;

2
static/dist/embed.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
static/dist/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
static/js/embed.js
View File

@@ -26,9 +26,6 @@ $(document).ready(function(){
$("head").append('<link type="text/css" rel="stylesheet" href="/static/css/embed.css" />');
$("head").append('<link type="text/css" rel="stylesheet" href="/static/css/materialize.min.css" />');
console.log(document);
console.log(window.location.hash)
add = "https://zoff.no";
socket = io.connect(''+add+':8880', connection_options);

3
static/js/list.js
View File

@@ -219,6 +219,7 @@ var List = {
if(list){
song.find(".list-votes").text(video_votes);
song.find("#list-song").attr("id", video_id);
song.find(".vote-container").attr("title", video_title);
attr = ".vote-container";
del_attr = "del";
@@ -233,7 +234,7 @@ var List = {
del_attr = "del_suggested";
song.find(".vote-container").attr("class", "clickable add-suggested");
song.find(".add-suggested").attr("title", "Add song!");
song.find(".add-suggested").attr("title", video_title);
song.find("#del").attr("id", del_attr);
song.find(attr).attr("data-video-title", video_title);
song.find(attr).attr("data-video-length", song_info.length);

1
static/js/youtube.js
View File

@@ -178,7 +178,6 @@ var Youtube = {
if(embed){
setTimeout(function(){
Youtube.ytplayer.seekTo(seekTo);
console.log("delayed search");
}, 1000);
}else
Youtube.ytplayer.seekTo(seekTo);