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

Crashed server.. fixing

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2016-04-25 20:45:12 +02:00
parent 4738d86dd8
commit 1595a5a062
4 changed files with 29 additions and 2997 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gulpfile.js
View File

@@ -5,11 +5,11 @@ var gulp = require('gulp'),
gulp.task('js', function () {
gulp.src(['static/js/*.js', '!static/js/embed*', '!static/js/remotecontroller.js'])
/*.pipe(uglify({
.pipe(uglify({
mangle: true,
compress: true,
enclose: true
}))*/
}))
.pipe(concat('main.min.js'))
.pipe(gulp.dest('static/dist'));
});

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

64
static/js/listeners.js
View File

@@ -157,7 +157,7 @@ function init(){
if(/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){
document.getElementById("search").blur();
$("#channel-load").css("display", "none");
Player.readyLooks();
} else {
window.onYouTubeIframeAPIReady = Player.onYouTubeIframeAPIReady;
Player.loadPlayer();
@@ -166,7 +166,7 @@ function init(){
Chat.allchat_listener();
if(!window.mobilecheck()) Hostcontroller.host_listener();
if(!Helper.msieversion() && !window.mobilecheck()) Notification.requestPermission();
if(!Helper.msieversion()) Notification.requestPermission();
git_info = $.ajax({ type: "GET",
url: "https://api.github.com/repos/zoff-music/zoff/commits",
@@ -196,39 +196,7 @@ function init(){
$(".search_input").focus();
$(".search_input").keyup(function(event) {
searching(event);
});
if(iPad|iPhone|iPod/.test(navigator.userAgent)){
if ($.browser.mozilla) {
$(".search_input").keyup(function(event) {
searching(event);
});
} else {
$(".search_input").keydown(function(event) {
searching(event);
});
}
}
/*setInterval(function(){
timer--;
if(timer===0){
Search.search($(".search_input").val());
}
}, 1);*/
//}, 1000);
$("#embed-button").css("display", "inline-block");
$("#embed-area").val('<embed src="https://zoff.no/embed.html#' + chan.toLowerCase() + '&autplay" width="600px" height="300px">');
$("#search").attr("placeholder", "Find song on YouTube...");
}
window.init = init;
function searching(event) {
search_input = $(this).val();
if (event.keyCode != 40 && event.keyCode != 38 && event.keyCode != 13 && event.keyCode != 39 && event.keyCode != 37 &&
@@ -246,7 +214,26 @@ function searching(event) {
timer=100;*/
}
}
});
/*setInterval(function(){
timer--;
if(timer===0){
Search.search($(".search_input").val());
}
}, 1);*/
//}, 1000);
$("#embed-button").css("display", "inline-block");
$("#embed-area").val('<embed src="https://zoff.no/embed.html#' + chan.toLowerCase() + '&autplay" width="600px" height="300px">');
$("#search").attr("placeholder", "Find song on YouTube...");
}
window.init = init;
$(document).keyup(function(e) {
if(event.keyCode == 27){
@@ -345,7 +332,7 @@ $(document).on("submit", "#adminForm", function(e){
$(document).on("click", ".chat-link", function(e){
chat_active = true;
unseen = false;display
unseen = false;
chat_unseen = false;
$(".chat-link").attr("style", "color: white !important;");
blinking = false;
@@ -370,15 +357,10 @@ $(document).on("click", ".suggested-link", function(e){
$("#suggestions").css("display", "block");
});
$(document).on("submit", "#chatForm", function(e){
e.preventDefault();
$(document).on("submit", "#chatForm", function(){
Chat.chat(document.getElementById("chatForm").input);
});
$(document).on("submit", "#song_search_form", function(e){
e.preventDefault();
});
$(document).on("click", "#shuffle", function(e)
{
e.preventDefault();