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

Removed alot of logs

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2016-01-25 14:52:07 +01:00
parent d8a10a5952
commit 0b3c709766
10 changed files with 60 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
index.php
View File

@@ -153,10 +153,10 @@
</div> </div>
</div> </div>
</header> </header>
<main class="container center-align main"> <div id="channel-load" class="progress">
<div id="channel-load" class="progress" style="top:52px;">
<div class="indeterminate" id="channel-load-move"></div> <div class="indeterminate" id="channel-load-move"></div>
</div> </div>
<main class="container center-align main">
<div id="main-row" class="row"> <div id="main-row" class="row">
<div class="col s12 m9 video-container hide-on-small-only"> <div class="col s12 m9 video-container hide-on-small-only">

2
php/channel.php
View File

@@ -145,10 +145,10 @@
</div> </div>
</div> </div>
</header> </header>
<main class="container center-align main">
<div id="channel-load" class="progress" style="top:52px;"> <div id="channel-load" class="progress" style="top:52px;">
<div class="indeterminate" id="channel-load-move"></div> <div class="indeterminate" id="channel-load-move"></div>
</div> </div>
<main class="container center-align main">
<div id="main-row" class="row"> <div id="main-row" class="row">
<div class="col s12 m9 video-container hide-on-small-only"> <div class="col s12 m9 video-container hide-on-small-only">

7
php/nochan.php
View File

@@ -82,9 +82,6 @@ if(isset($_GET['chan'])){
</header> </header>
<div class="section mega"> <div class="section mega">
<div id="channel-load" class="progress">
<div class="indeterminate" id="channel-load-move"></div>
</div>
<div id="mega-background"></div> <div id="mega-background"></div>
<h5>Create a radio channel, collaborate and listen</h5> <h5>Create a radio channel, collaborate and listen</h5>
<form class="channel-finder" onsubmit="return false;"> <form class="channel-finder" onsubmit="return false;">
@@ -135,7 +132,9 @@ if(isset($_GET['chan'])){
</div> </div>
</form> </form>
</div> </div>
<div id="channel-load" class="progress">
<div class="indeterminate" id="channel-load-move"></div>
</div>
<main class="center-align container"> <main class="center-align container">
<div class="section"> <div class="section">
<div id="preloader" class="progress"> <div id="preloader" class="progress">

7
php/nochan_content.php
View File

@@ -69,9 +69,6 @@
</header> </header>
<div class="section mega"> <div class="section mega">
<div id="channel-load" class="progress">
<div class="indeterminate" id="channel-load-move"></div>
</div>
<div id="mega-background"></div> <div id="mega-background"></div>
<h5>Create a radio channel, collaborate and listen</h5> <h5>Create a radio channel, collaborate and listen</h5>
<form class="channel-finder" onsubmit="return false;"> <form class="channel-finder" onsubmit="return false;">
@@ -122,7 +119,9 @@
</div> </div>
</form> </form>
</div> </div>
<div id="channel-load" class="progress">
<div class="indeterminate" id="channel-load-move"></div>
</div>
<main class="center-align container"> <main class="center-align container">
<div class="section"> <div class="section">
<div id="preloader" class="progress"> <div id="preloader" class="progress">

2
static/css/style.css
View File

@@ -52,7 +52,7 @@
#channel-load{ #channel-load{
display:none; display:none;
position: absolute; position: absolute;
top: -8px; top: 52px;
background-color:rgba(0,0,0,0); background-color:rgba(0,0,0,0);
} }

2
static/dist/frontpage.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

67
static/js/listeners.js
View File

@@ -254,8 +254,8 @@ $(window).focus(function(){
} }
}); });
document.getElementById("chat-btn").addEventListener("click", function(){ $(document).on("click", "#chat-btn", function(){
$("#text-chat-input").focus(); $("#text-chat-input").focus();
//$("#chat-btn").css("color", "white"); //$("#chat-btn").css("color", "white");
$("#chat-btn i").css("opacity", 1); $("#chat-btn i").css("opacity", 1);
clearInterval(blink_interval); clearInterval(blink_interval);
@@ -264,53 +264,61 @@ document.getElementById("chat-btn").addEventListener("click", function(){
$("#favicon").attr("href", "static/images/favicon.png"); $("#favicon").attr("href", "static/images/favicon.png");
}); });
$(".chat-tab").click(function(){ $(document).on("click", ".chat-tab", function(){
$("#text-chat-input").focus(); $("#text-chat-input").focus();
}); });
$("#skip").on("click", function(){ $(document).on("click", "#skip", function(e){
List.skip(); e.preventDefault();
List.skip();
}); });
$(document).on("click", "#chan", function(){ $(document).on("click", "#chan", function(e){
List.show(); e.preventDefault();
List.show();
}); });
$("#adminForm").on("submit", function(){ $(document).on("submit", "#adminForm", function(e){
Admin.pass_save(); e.preventDefault();
Admin.pass_save();
}); });
$("#chatForm").on("submit", function(){ $(document).on("submit", "#chatForm", function(){
Chat.chat(document.getElementById("chatForm").input); Chat.chat(document.getElementById("chatForm").input);
}); });
$("#shuffle").on("click", function() $(document).on("click", "#shuffle", function(e)
{ {
Admin.shuffle(); e.preventDefault();
Admin.shuffle();
}); });
$("#search-btn").on("click", function() $(document).on("click", "#search-btn", function(e)
{ {
Search.showSearch(); e.preventDefault();
Search.showSearch();
}); });
$("#song-title").on("click", function() $(document).on("click", "#song-title", function(e)
{ {
Search.showSearch(); e.preventDefault();
Search.showSearch();
}); });
$("#admin-lock").on("click", function() $(document).on("click", "#admin-lock", function(e)
{ {
Admin.log_out(); e.preventDefault();
Admin.log_out();
}); });
$("#closeSettings").on("click", function() $(document).on("click", "#closeSettings", function(e)
{ {
Admin.hide_settings(); e.preventDefault();
Admin.hide_settings();
}); });
$("#results").on( "click", "#temp-results", function(e){ $(document).on( "click", "#temp-results", function(e){
if($(e.target).html() != $("<i class='mdi-av-playlist-add'></i>").html()){ if($(e.target).html() != $("<i class='mdi-av-playlist-add'></i>").html()){
var id = $(this).attr("data-video-id"); var id = $(this).attr("data-video-id");
var title = $(this).attr("data-video-title"); var title = $(this).attr("data-video-title");
@@ -320,7 +328,7 @@ $("#results").on( "click", "#temp-results", function(e){
} }
}); });
$("#results").on( "click", "#add-many", function(e){ $(document).on( "click", "#add-many", function(e){
var id = $(this).attr("data-video-id"); var id = $(this).attr("data-video-id");
var title = $(this).attr("data-video-title"); var title = $(this).attr("data-video-title");
var length = $(this).attr("data-video-length"); var length = $(this).attr("data-video-length");
@@ -328,17 +336,17 @@ $("#results").on( "click", "#add-many", function(e){
Search.submit(id, title, length); Search.submit(id, title, length);
}); });
$("#wrapper").on( "click", ".vote-container", function(e){ $(document).on( "click", ".vote-container", function(e){
var id = $(this).attr("data-video-id"); var id = $(this).attr("data-video-id");
List.vote(id, "pos"); List.vote(id, "pos");
}); });
$("#wrapper").on( "click", "#del", function(e){ $(document).on( "click", "#del", function(e){
var id = $(this).attr("data-video-id"); var id = $(this).attr("data-video-id");
List.vote(id, "del"); List.vote(id, "del");
}); });
$("#suggestions").on( "click", ".add-suggested", function(e){ $(document).on( "click", ".add-suggested", function(e){
var id = $(this).attr("data-video-id"); var id = $(this).attr("data-video-id");
var title = $(this).attr("data-video-title"); var title = $(this).attr("data-video-title");
var length = $(this).attr("data-video-length"); var length = $(this).attr("data-video-length");
@@ -348,13 +356,13 @@ $("#suggestions").on( "click", ".add-suggested", function(e){
$("#suggested-" + id).remove(); $("#suggested-" + id).remove();
}); });
$("#suggestions").on( "click", "#del_suggested", function(e){ $(document).on( "click", "#del_suggested", function(e){
var id = $(this).attr("data-video-id"); var id = $(this).attr("data-video-id");
$("#suggested-" + id).remove(); $("#suggested-" + id).remove();
}); });
$("#suggestions").on( "click", "#del_user_suggested", function(e){ $(document).on( "click", "#del_user_suggested", function(e){
var id = $(this).attr("data-video-id"); var id = $(this).attr("data-video-id");
$("#suggested-" + id).remove(); $("#suggested-" + id).remove();
List.vote(id, "del"); List.vote(id, "del");
@@ -466,11 +474,12 @@ function onepage_load(){
$("header").html($($(e)[0]).html()); $("header").html($($(e)[0]).html());
$($(e)[2]).insertAfter("header"); $($(e)[2]).insertAfter("header");
$($(e)[4]).insertAfter(".mega"); $($(e)[4]).insertAfter(".mega");
$("main").html($($(e)[6]).html()); $("main").html($($(e)[8]).html());
if($("#alreadychannel").length == 0) $("head").append("<div id='alreadychannel'></div") if($("#alreadychannel").length == 0) $("head").append("<div id='alreadychannel'></div")
if($("#alreadyfp").length == 1) window.initfp(); if($("#alreadyfp").length == 1) window.initfp();
else $("#scripts").append($($(e)[8]).html()); else $("#scripts").append($($(e)[10]).html());
$("#channel-load").css("display", "none");
}, 1000); }, 1000);
document.title = "Zöff"; document.title = "Zöff";

12
static/js/nochan.js
View File

@@ -2,6 +2,7 @@
var channel_list; var channel_list;
var git_info; var git_info;
var frontpage = true;
/* /*
function getCookie(cname) { function getCookie(cname) {
@@ -167,7 +168,7 @@ var Nochan = {
} }
setTimeout(function(){ setTimeout(function(){
Nochan.add_backdrop(list, i+1); if(frontpage) Nochan.add_backdrop(list, i+1);
},6000); },6000);
}, },
@@ -203,6 +204,7 @@ var Nochan = {
$("#channel-load").css("display", "block"); $("#channel-load").css("display", "block");
window.scrollTo(0, 0); window.scrollTo(0, 0);
frontpage = false;
socket.removeAllListeners(); socket.removeAllListeners();
@@ -216,17 +218,19 @@ var Nochan = {
if(!popstate) window.history.pushState("to the channel!", "Title", "/" + chan + "/"); if(!popstate) window.history.pushState("to the channel!", "Title", "/" + chan + "/");
console.log($(e));
$(".mega").remove(); $(".mega").remove();
$(".mobile-search").remove(); $(".mobile-search").remove();
$("main").attr("class", "container center-align main"); $("main").attr("class", "container center-align main");
$("body").attr("id", "channelpage"); $("body").attr("id", "channelpage");
$("header").html($($(e)[0]).html()); $("header").html($($(e)[0]).html());
$("main").html($($(e)[2]).html()); $("main").html($($(e)[4]).html());
$("#search").attr("placeholder", "Find song on youtube");
if($("#alreadychannel").length == 1){ if($("#alreadychannel").length == 1){
window.init(); window.init();
}else{ }else{
$("#scripts").append($($(e)[4]).html()); $("#scripts").append($($(e)[6]).html());
} }
if($("#alreadyfp").length == 0) $("head").append("<div id='alreadyfp'></div>"); if($("#alreadyfp").length == 0) $("head").append("<div id='alreadyfp'></div>");
} }

1
static/js/youtube.js
View File

@@ -163,6 +163,7 @@ var Youtube = {
}, },
onPlayerReady: function(event) { onPlayerReady: function(event) {
$("#channel-load").css("display", "none");
try{ try{
beginning = true; beginning = true;
player_ready = true; player_ready = true;