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

Fixed faster loading between views

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2016-02-21 18:26:42 +01:00
parent 363b1c619b
commit 4891efecb0
7 changed files with 177 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
index.php
View File

@@ -273,11 +273,8 @@
<?php include("php/footer.php"); ?>
<div id="scripts">
<script type="text/javascript" src="/static/dist/lib/jquery.lazyload.js"></script>
<script type="text/javascript" src="/static/dist/lib/color-thief.js"></script>
<script type="text/javascript" src="//crypto-js.googlecode.com/svn/tags/3.1.2/build/rollups/sha256.js"></script>
<script type="text/javascript" src="//crypto-js.googlecode.com/svn/tags/3.1.2/build/rollups/aes.js"></script>
<script type="text/javascript" src="/static/dist/main.min.js"></script>
</div>
<script type="text/javascript" src="/static/dist/main.min.js"></script>
</body>
</html>

6
php/footer.php
View File

@@ -136,9 +136,3 @@
</div>
</div>
</footer>
<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"></script>
<script type="text/javascript" src="/static/dist/lib/materialize.min.js"></script>
<script type="text/javascript" src="//cdn.socket.io/socket.io-1.4.5.js"></script>

9
php/header.php
View File

@@ -31,3 +31,12 @@
ga('send', 'pageview');
</script>
<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"></script>
<script type="text/javascript" src="/static/dist/lib/materialize.min.js"></script>
<script type="text/javascript" src="//cdn.socket.io/socket.io-1.4.5.js"></script>
<script type="text/javascript" src="/static/dist/lib/jquery.lazyload.js"></script>
<script type="text/javascript" src="/static/dist/lib/color-thief.js"></script>
<script type="text/javascript" src="//crypto-js.googlecode.com/svn/tags/3.1.2/build/rollups/sha256.js"></script>
<script type="text/javascript" src="//crypto-js.googlecode.com/svn/tags/3.1.2/build/rollups/aes.js"></script>

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

86
static/js/listeners.js
View File

@@ -5,7 +5,7 @@ var showToggle = true;
var list_html = $("#list-song-html").html();
var blink_interval_exists = false;
var unseen = false;
var timer = 0;
//var timer = 0;
var api_key = "***REMOVED***";
var result_html = $("#temp-results-container");
var empty_results_html = $("#empty-results-container").html();
@@ -28,6 +28,7 @@ var lazy_load = true;
var embed = false;
var autoplay = true;
var timeout_search;
var id;
var full_playlist;
var conf;
@@ -48,7 +49,9 @@ var connection_options = {
'force new connection': true
};
$().ready(function(){init();});
$().ready(function(){
if(!window.fromFront) init();
});
function init(){
@@ -63,21 +66,10 @@ function init(){
chan = $("#chan").html();
if(window.location.hostname == "zoff.no") add = "https://zoff.no";
else add = "localhost";
socket = io.connect(''+add+':8880', connection_options);
socket.on("get_list", function(){
setTimeout(function(){socket.emit('list', chan.toLowerCase())},1000);
});
socket.on("suggested", function(params){
var single = true;
if(params.id == undefined)
single = false;
setTimeout(function(){Suggestions.catchUserSuggests(params, single)}, 1000);
});
setTimeout(function(){
Youtube.stopInterval= false;
//setTimeout(function(){
if(Youtube != undefined) Youtube.stopInterval= false;
//window.vote = List.vote;
//window.submit = Search.submit;
//window.submitAndClose = Search.submitAndClose;
@@ -87,9 +79,6 @@ function init(){
localStorage.setItem("list_update", "13.06.15");
window.location.reload(true);
}
Youtube.setup_youtube_listener(chan);
Admin.admin_listener();
List.channel_listener();
$('ul.tabs').tabs();
$("#settings").sideNav({
@@ -123,6 +112,27 @@ function init(){
socket.emit("password", [localStorage[chan.toLowerCase()], chan.toLowerCase()]);
}*/
socket = io.connect(''+add+':8880', connection_options);
Youtube.setup_youtube_listener(chan);
Admin.admin_listener();
List.channel_listener();
socket.on("get_list", function(){
//setTimeout(function(){
socket.emit('list', chan.toLowerCase())
//},1000);
});
socket.on("suggested", function(params){
var single = true;
if(params.id == undefined)
single = false;
//setTimeout(function(){
Suggestions.catchUserSuggests(params, single);
//}, 1000);
});
if(/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){
document.getElementById("search").blur();
Youtube.readyLooks();
@@ -174,28 +184,35 @@ function init(){
$(".search_input").focus();
$(".search_input").keyup(function(event) {
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 &&
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{
i = 0;
timer=100;
timeout_search = setTimeout(function(){
Search.search(search_input);
}, 1000);
/*i = 0;
timer=100;*/
}
}
});
setInterval(function(){
/*setInterval(function(){
timer--;
if(timer===0){
Search.search($(".search_input").val());
}
}, 1);
}, 1000);
}, 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">');
@@ -465,6 +482,7 @@ function onepage_load(){
url: "php/nochan.php",
success: function(e){
socket.disconnect();
document.getElementById("volume-button").removeEventListener("click", Playercontrols.mute_video);
@@ -485,17 +503,27 @@ function onepage_load(){
$("main").attr("class", "center-align container");
$("body").attr("id", "");
$("body").attr("style", "");
$("header").html($($(e)[37]).html());
$($(e)[39]).insertAfter("header");
$($(e)[41]).insertAfter(".mega");
$("main").html($($(e)[45]).html());
$("header").html($($(e)[53]).html());
$($(e)[55]).insertAfter("header");
$($(e)[57]).insertAfter(".mega");
$("main").html($($(e)[61]).html());
if($("#alreadyfp").length == 1){
window.initfp();
}else {
if(window.location.hostname == "zoff.no") number = 47;
else number = 65;
$("#scripts").append($($(e)[number]).html());
window.fromChannel = true;
//$("#scripts").append($($(e)[number]).html());
var scriptScript = document.createElement('script');
scriptScript.type = "text/javascript";
scriptScript.src = "/static/dist/frontpage.min.js";
//scriptScript.async = true;
//$.holdReady( true );
scriptScript.onreadystatechange = scriptScript.onload = function() {
window.initfp();
}
document.getElementById("scripts").appendChild(scriptScript);
}
if($("#alreadychannel").length == 0){

22
static/js/nochan.js
View File

@@ -239,13 +239,25 @@ var Nochan = {
$(".mobile-search").remove();
$("main").attr("class", "container center-align main");
$("body").attr("id", "channelpage");
$("header").html($($(e)[37]).html());
$("main").html($($(e)[41]).html());
$("header").html($($(e)[53]).html());
$("main").html($($(e)[57]).html());
$("#search").attr("placeholder", "Find song on youtube");
if($("#alreadychannel").length == 1){
window.init();
}else{
$("#scripts").append($($(e)[55]).html());
window.fromFront = true;
//console.log($($(e)[55]).html());
//$("#scripts").append($($(e)[55]).html());
var scriptScript = document.createElement('script');
scriptScript.type = "text/javascript";
scriptScript.src = "/static/dist/main.min.js";
//scriptScript.async = true;
//$.holdReady( true );
scriptScript.onreadystatechange = scriptScript.onload = function() {
window.init();
}
document.getElementById("scripts").appendChild(scriptScript);
}
if($("#alreadyfp").length == 0) $("head").append("<div id='alreadyfp'></div>");
}
@@ -258,7 +270,9 @@ String.prototype.capitalizeFirstLetter = function() {
return this.charAt(0).toUpperCase() + this.slice(1);
}
$().ready(initfp);
$().ready(function(){
if(!window.fromChannel) initfp();
});
function share_link_modifier(){
$("#facebook-code-link").attr("href", "https://www.facebook.com/sharer/sharer.php?u=https://zoff.no/");