mirror of
https://github.com/KevinMidboe/zoff.git
synced 2025-12-29 13:31:00 +00:00
Crashed server.. fixing
This commit is contained in:
@@ -5,11 +5,11 @@ var gulp = require('gulp'),
|
|||||||
|
|
||||||
gulp.task('js', function () {
|
gulp.task('js', function () {
|
||||||
gulp.src(['static/js/*.js', '!static/js/embed*', '!static/js/remotecontroller.js'])
|
gulp.src(['static/js/*.js', '!static/js/embed*', '!static/js/remotecontroller.js'])
|
||||||
/*.pipe(uglify({
|
.pipe(uglify({
|
||||||
mangle: true,
|
mangle: true,
|
||||||
compress: true,
|
compress: true,
|
||||||
enclose: true
|
enclose: true
|
||||||
}))*/
|
}))
|
||||||
.pipe(concat('main.min.js'))
|
.pipe(concat('main.min.js'))
|
||||||
.pipe(gulp.dest('static/dist'));
|
.pipe(gulp.dest('static/dist'));
|
||||||
});
|
});
|
||||||
|
|||||||
2
static/dist/embed.min.js
vendored
2
static/dist/embed.min.js
vendored
File diff suppressed because one or more lines are too long
2954
static/dist/main.min.js
vendored
2954
static/dist/main.min.js
vendored
File diff suppressed because one or more lines are too long
@@ -157,7 +157,7 @@ function init(){
|
|||||||
|
|
||||||
if(/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){
|
if(/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){
|
||||||
document.getElementById("search").blur();
|
document.getElementById("search").blur();
|
||||||
$("#channel-load").css("display", "none");
|
Player.readyLooks();
|
||||||
} else {
|
} else {
|
||||||
window.onYouTubeIframeAPIReady = Player.onYouTubeIframeAPIReady;
|
window.onYouTubeIframeAPIReady = Player.onYouTubeIframeAPIReady;
|
||||||
Player.loadPlayer();
|
Player.loadPlayer();
|
||||||
@@ -166,7 +166,7 @@ function init(){
|
|||||||
Chat.allchat_listener();
|
Chat.allchat_listener();
|
||||||
if(!window.mobilecheck()) Hostcontroller.host_listener();
|
if(!window.mobilecheck()) Hostcontroller.host_listener();
|
||||||
|
|
||||||
if(!Helper.msieversion() && !window.mobilecheck()) Notification.requestPermission();
|
if(!Helper.msieversion()) Notification.requestPermission();
|
||||||
|
|
||||||
git_info = $.ajax({ type: "GET",
|
git_info = $.ajax({ type: "GET",
|
||||||
url: "https://api.github.com/repos/zoff-music/zoff/commits",
|
url: "https://api.github.com/repos/zoff-music/zoff/commits",
|
||||||
@@ -196,39 +196,7 @@ function init(){
|
|||||||
|
|
||||||
$(".search_input").focus();
|
$(".search_input").focus();
|
||||||
$(".search_input").keyup(function(event) {
|
$(".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();
|
search_input = $(this).val();
|
||||||
|
|
||||||
if (event.keyCode != 40 && event.keyCode != 38 && event.keyCode != 13 && event.keyCode != 39 && event.keyCode != 37 &&
|
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;*/
|
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) {
|
$(document).keyup(function(e) {
|
||||||
if(event.keyCode == 27){
|
if(event.keyCode == 27){
|
||||||
@@ -345,7 +332,7 @@ $(document).on("submit", "#adminForm", function(e){
|
|||||||
|
|
||||||
$(document).on("click", ".chat-link", function(e){
|
$(document).on("click", ".chat-link", function(e){
|
||||||
chat_active = true;
|
chat_active = true;
|
||||||
unseen = false;display
|
unseen = false;
|
||||||
chat_unseen = false;
|
chat_unseen = false;
|
||||||
$(".chat-link").attr("style", "color: white !important;");
|
$(".chat-link").attr("style", "color: white !important;");
|
||||||
blinking = false;
|
blinking = false;
|
||||||
@@ -370,15 +357,10 @@ $(document).on("click", ".suggested-link", function(e){
|
|||||||
$("#suggestions").css("display", "block");
|
$("#suggestions").css("display", "block");
|
||||||
});
|
});
|
||||||
|
|
||||||
$(document).on("submit", "#chatForm", function(e){
|
$(document).on("submit", "#chatForm", function(){
|
||||||
e.preventDefault();
|
|
||||||
Chat.chat(document.getElementById("chatForm").input);
|
Chat.chat(document.getElementById("chatForm").input);
|
||||||
});
|
});
|
||||||
|
|
||||||
$(document).on("submit", "#song_search_form", function(e){
|
|
||||||
e.preventDefault();
|
|
||||||
});
|
|
||||||
|
|
||||||
$(document).on("click", "#shuffle", function(e)
|
$(document).on("click", "#shuffle", function(e)
|
||||||
{
|
{
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
|||||||
Reference in New Issue
Block a user