KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +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

2
embed.html
View File

@@ -5,6 +5,6 @@
<meta charset="UTF-8"/> <meta charset="UTF-8"/>
</head> </head>
<body> <body>
<div id="song-title"></div><div id="container" style="display:inline-flex;"><div id="player-container"><div id="player"></div><div id="controls" class="noselect"><div id="zoffbutton" title="Visit the channel!"></div><div id="playpause"><i id="play" class="mdi-av-play-arrow hide"></i><i id="pause" class="mdi-av-pause"></i></div><div id="duration">00:00 / 00:00</div><div id="fullscreen"><i class="mdi-navigation-fullscreen"></i></div><div id="volume-button"><i id="v-mute" class="mdi-av-volume-off"></i><i id="v-low" class="mdi-av-volume-mute"></i><i id="v-medium" class="mdi-av-volume-down"></i><i id="v-full" class="mdi-av-volume-up"></i></div><div id="volume"></div><div id="viewers"></div><div id="bar"></div></div></div><div id="playlist"><div id="wrapper"><div id="preloader" class="progress channel_preloader"><div class="indeterminate"></div></div><div id="list-song-html"><div id="list-song" class="card left-align list-song"><span class="clickable vote-container" title="Vote!"><a class="clickable center-align votebg"><div class="lazy card-image cardbg list-image" style=""></div></a><span class="card-content"><span class="flow-text truncate list-title"></span><span class="vote-span"><span class="list-votes"></span><span class="highlighted vote-text">&nbsp;votes</span></span></span></span></div></div></div></div></div><script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script><script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"></script><script type="text/javascript" src="//cdn.socket.io/socket.io-1.3.5.js"></script><script src="static/dist/embed.min.js"></script> <div id="song-title"></div><div id="container" style="display:inline-flex;"><div id="player-container"><div id="player"></div><div id="controls" class="noselect"><div id="zoffbutton" title="Visit the channel!"></div><div id="playpause"><i id="play" class="mdi-av-play-arrow hide"></i><i id="pause" class="mdi-av-pause"></i></div><div id="duration">00:00 / 00:00</div><div id="volume-button"><i id="v-mute" class="mdi-av-volume-off"></i><i id="v-low" class="mdi-av-volume-mute"></i><i id="v-medium" class="mdi-av-volume-down"></i><i id="v-full" class="mdi-av-volume-up"></i></div><div id="volume"></div><div id="viewers"></div><div id="bar"></div></div></div><div id="playlist"><div id="wrapper"><div id="preloader" class="progress channel_preloader"><div class="indeterminate"></div></div><div id="list-song-html"><div id="list-song" class="card left-align list-song"><span class="clickable vote-container" title="Vote!"><a class="clickable center-align votebg"><div class="lazy card-image cardbg list-image" style=""></div></a><span class="card-content"><span class="flow-text truncate list-title"></span><span class="vote-span"><span class="list-votes"></span><span class="highlighted vote-text">&nbsp;votes</span></span></span></span></div></div></div></div></div><script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script><script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"></script><script type="text/javascript" src="//cdn.socket.io/socket.io-1.3.5.js"></script><script src="static/dist/embed.min.js"></script>
</body> </body>
</html> </html>

4
static/css/embed.css
View File

@@ -180,11 +180,11 @@
font-family:"Roboto", sans-serif; font-family:"Roboto", sans-serif;
font-weight:300; font-weight:300;
margin-left:15px; margin-left:15px;
margin-right:5px;
} }
#viewers{ #viewers{
float: right; float: right;
display:none;
} }
#play, #pause, #volume-button, #fullscreen #play, #pause, #volume-button, #fullscreen
@@ -200,7 +200,7 @@
left: 10px; left: 10px;
margin: 13px auto; margin: 13px auto;
height:5px; height:5px;
width: 75px; width: 60px;
/*background-color:rgba(0, 0, 0, 0.5);*/ /*background-color:rgba(0, 0, 0, 0.5);*/
background:rgba(0, 0, 0, 0.5) 50% 50% repeat-x; background:rgba(0, 0, 0, 0.5) 50% 50% repeat-x;
border: none; 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/embed.css" />');
$("head").append('<link type="text/css" rel="stylesheet" href="/static/css/materialize.min.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"; add = "https://zoff.no";
socket = io.connect(''+add+':8880', connection_options); socket = io.connect(''+add+':8880', connection_options);

3
static/js/list.js
View File

@@ -219,6 +219,7 @@ var List = {
if(list){ if(list){
song.find(".list-votes").text(video_votes); song.find(".list-votes").text(video_votes);
song.find("#list-song").attr("id", video_id); song.find("#list-song").attr("id", video_id);
song.find(".vote-container").attr("title", video_title);
attr = ".vote-container"; attr = ".vote-container";
del_attr = "del"; del_attr = "del";
@@ -233,7 +234,7 @@ var List = {
del_attr = "del_suggested"; del_attr = "del_suggested";
song.find(".vote-container").attr("class", "clickable add-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("#del").attr("id", del_attr);
song.find(attr).attr("data-video-title", video_title); song.find(attr).attr("data-video-title", video_title);
song.find(attr).attr("data-video-length", song_info.length); 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){ if(embed){
setTimeout(function(){ setTimeout(function(){
Youtube.ytplayer.seekTo(seekTo); Youtube.ytplayer.seekTo(seekTo);
console.log("delayed search");
}, 1000); }, 1000);
}else }else
Youtube.ytplayer.seekTo(seekTo); Youtube.ytplayer.seekTo(seekTo);