Trying to fix for iphone

This commit is contained in:
Kasper Rynning-Tønnesen
2016-04-25 20:42:54 +02:00
parent e5fcce1d88
commit 4738d86dd8
5 changed files with 3001 additions and 31 deletions

View File

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

View File

@@ -30,7 +30,9 @@
Loading... Loading...
</li> </li>
<li class="search-container hide" id="search-wrapper"> <li class="search-container hide" id="search-wrapper">
<form id="song_search_form">
<input id="search" class="search_input" type="text" title="Search for songs..." placeholder="Find song on YouTube..." onsubmit="null;" autocomplete="off" /> <input id="search" class="search_input" type="text" title="Search for songs..." placeholder="Find song on YouTube..." onsubmit="null;" autocomplete="off" />
</form>
</li> </li>
</ul> </ul>
@@ -259,7 +261,7 @@
</ul> </ul>
</li> </li>
<li id="chat-input"> <li id="chat-input">
<form action="#" id="chatForm" onsubmit="return false;"> <form action="#" id="chatForm">
<input id="text-chat-input" name="input" type="text" autocomplete="off" placeholder="Chat" maxlength="150" /> <input id="text-chat-input" name="input" type="text" autocomplete="off" placeholder="Chat" maxlength="150" />
</form> </form>
</li> </li>

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){ if(/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){
document.getElementById("search").blur(); document.getElementById("search").blur();
Player.readyLooks(); $("#channel-load").css("display", "none");
} 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()) Notification.requestPermission(); if(!Helper.msieversion() && !window.mobilecheck()) 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,28 +196,21 @@ function init(){
$(".search_input").focus(); $(".search_input").focus();
$(".search_input").keyup(function(event) { $(".search_input").keyup(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;*/
}
}
}); });
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(){ /*setInterval(function(){
timer--; timer--;
@@ -235,6 +228,26 @@ function init(){
window.init = 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) { $(document).keyup(function(e) {
if(event.keyCode == 27){ if(event.keyCode == 27){
$("#results").html(""); $("#results").html("");
@@ -332,7 +345,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; unseen = false;display
chat_unseen = false; chat_unseen = false;
$(".chat-link").attr("style", "color: white !important;"); $(".chat-link").attr("style", "color: white !important;");
blinking = false; blinking = false;
@@ -357,8 +370,13 @@ $(document).on("click", ".suggested-link", function(e){
$("#suggestions").css("display", "block"); $("#suggestions").css("display", "block");
}); });
$(document).on("submit", "#chatForm", function(){ $(document).on("submit", "#chatForm", function(e){
Chat.chat(document.getElementById("chatForm").input); e.preventDefault();
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)