Crashed server.. fixing

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

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'));
});

File diff suppressed because one or more lines are too long

2954
static/dist/main.min.js vendored

File diff suppressed because one or more lines are too long

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,20 +196,27 @@ 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);
});
search_input = $(this).val();
if (event.keyCode != 40 && event.keyCode != 38 && event.keyCode != 13 && event.keyCode != 39 && event.keyCode != 37 &&
event.keyCode != 17 && event.keyCode != 16 && event.keyCode != 225 && event.keyCode != 18) {
clearTimeout(timeout_search);
if(search_input.length < 3){$("#results").html("");}
if(event.keyCode == 13){
Search.search(search_input);
}else{
timeout_search = setTimeout(function(){
Search.search(search_input);
}, 1000);
/*i = 0;
timer=100;*/
}
}
}
});
/*setInterval(function(){
@@ -228,26 +235,6 @@ function init(){
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 &&
event.keyCode != 17 && event.keyCode != 16 && event.keyCode != 225 && event.keyCode != 18) {
clearTimeout(timeout_search);
if(search_input.length < 3){$("#results").html("");}
if(event.keyCode == 13){
Search.search(search_input);
}else{
timeout_search = setTimeout(function(){
Search.search(search_input);
}, 1000);
/*i = 0;
timer=100;*/
}
}
}
$(document).keyup(function(e) {
if(event.keyCode == 27){
$("#results").html("");
@@ -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,13 +357,8 @@ $(document).on("click", ".suggested-link", function(e){
$("#suggestions").css("display", "block");
});
$(document).on("submit", "#chatForm", function(e){
e.preventDefault();
Chat.chat(document.getElementById("chatForm").input);
});
$(document).on("submit", "#song_search_form", function(e){
e.preventDefault();
$(document).on("submit", "#chatForm", function(){
Chat.chat(document.getElementById("chatForm").input);
});
$(document).on("click", "#shuffle", function(e)