From f85c6bbfe0aeb6e43b5fa66a21a40e04045cee9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Thu, 12 Feb 2015 22:45:06 +0100 Subject: [PATCH 01/19] Loading bg before transitioning --- js/youtube.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/js/youtube.js b/js/youtube.js index bb3aee26..d987803b 100755 --- a/js/youtube.js +++ b/js/youtube.js @@ -366,11 +366,17 @@ function setBGimage(id){ { $("#bgimage").css("background-image", "url(bg4.jpg);"); }else if(window.mozInnerScreenX == null && !window.mobilecheck()){ + var bg = new Image(); + bg.src = "http://img.youtube.com/vi/"+id+"/0.jpg"; $("#bgimage").addClass("noopacity"); - setTimeout(function(){ - $("#bgimage").css("background-image", "url(http://img.youtube.com/vi/"+id+"/0.jpg)"); - $("#bgimage").removeClass("noopacity"); - }, 1000); + console.log(bg); + bg.addEventListener("load", function(){ + setTimeout(function(){ + $("#bgimage").css("background-image", "url("+bg.src+")"); + //document.getElementById("bgimage").backgroundImage.src = bg.src; + $("#bgimage").removeClass("noopacity"); + }, 1000); + }); }else if(window.mobilecheck()){ $("#mobile-banner").css("background-image", "url(http://img.youtube.com/vi/"+id+"/hqdefault.jpg)"); $("#mobile-banner").css("width",$(window).width()); From e109ed3f0b456d2d104039d2db9552736d416c4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Thu, 12 Feb 2015 23:20:46 +0100 Subject: [PATCH 02/19] Added fading and hopefully a better userexperience --- js/youtube.js | 11 ++++++++--- static/controlstyle.css | 3 +++ static/style.css | 15 +++++++++++++-- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/js/youtube.js b/js/youtube.js index d987803b..3eac3661 100755 --- a/js/youtube.js +++ b/js/youtube.js @@ -61,7 +61,7 @@ $(document).ready(function() response = "1"; } - + /* $.ajax({ type: 'get', url: 'php/timedifference.php', @@ -72,7 +72,7 @@ $(document).ready(function() } }); console.log("timediff:"+timeDifference[0]); - +*/ if(window.mobilecheck()){ //syncInterval = setInterval(getTime, 50000); @@ -94,6 +94,7 @@ $(document).ready(function() }); function onYouTubeIframeAPIReady() { + $("#change").css("opacity", "1"); ytplayer = new YT.Player('player', { height: window.height*0.75, width: window.width*0.6, @@ -106,6 +107,8 @@ function onYouTubeIframeAPIReady() { 'onPlaybackQualityChange': logQ } }); + $("#player").css("opacity", "0"); + initYoutubeControls(ytplayer); } function onPlayerStateChange(newState) { @@ -347,9 +350,11 @@ function onPlayerReady(event) { getTime(); if(!window.mobilecheck()) { + $("#player").css("opacity", "1"); + $("#controls").css("opacity", "1"); + //$("#player").fadeIn(); ytplayer.playVideo(); } - initYoutubeControls(ytplayer); readyLooks(); initSlider(); //durationFixer = setInterval(durationSetter, 1000); diff --git a/static/controlstyle.css b/static/controlstyle.css index 2e01f5e4..8e4f22d1 100755 --- a/static/controlstyle.css +++ b/static/controlstyle.css @@ -1,6 +1,7 @@ #controls { + opacity:0; height:30px; background-color:rgba(255, 255, 255, 0.25); position:absolute; @@ -11,6 +12,8 @@ -ms-transform: translate3d(0,0,0); -o-transform: translate3d(0,0,0); transform: translate3d(0,0,0); + -webkit-transition:opacity 1s; + transition: opacity 1s; } #q, #fullscreen, #playpause diff --git a/static/style.css b/static/style.css index e893ed77..94c3b598 100755 --- a/static/style.css +++ b/static/style.css @@ -35,6 +35,11 @@ body { -webkit-transform:translateY(-54%) } +#change { + opacity:0; + -webkit-transition: opacity 1s; +} + /*#change{ display: table-cell; vertical-align: middle;}*/ ::-webkit-input-placeholder { color:#FEFEFE @@ -369,11 +374,17 @@ body { } #player { + -webkit-transition: opacity 1s; + transition: opacity 1s; height:68%; height:calc(87% - 213px); width:60%; border-radius:3px -/*box-shadow: 0 8px 11px -4px black;*/ + /*box-shadow: 0 8px 11px -4px black;*/ +} + +iframe { + -webkit-transition:opacity 1s; } #playlist { @@ -656,7 +667,7 @@ body { #toptitle { color:#fff; font-weight:700; - text-shadow:0 0 12px rgba(0,0,0,0.5) + text-shadow:0 0 12px rgba(0,0,0,0.5); } #mobile-banner { From 6354ce411c4720db7289f150f93a80a6da5fd1c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Thu, 12 Feb 2015 23:22:16 +0100 Subject: [PATCH 03/19] INLINE CSS IS KING PLZ b0ss p0si --- php/nochan.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/nochan.php b/php/nochan.php index 5555583e..0009650a 100755 --- a/php/nochan.php +++ b/php/nochan.php @@ -55,7 +55,7 @@ foreach($fil as $files){
-
+
Zöff
From 348de06f5ae8fbb483317d2a26c09bc26c3c2126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Thu, 12 Feb 2015 23:25:58 +0100 Subject: [PATCH 04/19] fuck inline HEAD IS BEST --- js/youtube.js | 1 + php/nochan.php | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/js/youtube.js b/js/youtube.js index 3eac3661..32f0ba98 100755 --- a/js/youtube.js +++ b/js/youtube.js @@ -33,6 +33,7 @@ var adminpass = ""; $(document).ready(function() { + $("#change").css("opacity", "0"); window.mobilecheck = function() { var check = false; (function(a){if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4)))check = true;})(navigator.userAgent||navigator.vendor||window.opera); diff --git a/php/nochan.php b/php/nochan.php index 0009650a..94ef8afd 100755 --- a/php/nochan.php +++ b/php/nochan.php @@ -50,12 +50,17 @@ foreach($fil as $files){ +
-
+
Zöff
From 0833ce4a4a1917154e64a3b6824881e579053669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Thu, 12 Feb 2015 23:29:02 +0100 Subject: [PATCH 05/19] =?UTF-8?q?n=C3=A5=20er=20dne=20fin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/glight.png | Bin 0 -> 1571 bytes static/gmark.png | Bin 0 -> 1714 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100755 static/glight.png create mode 100755 static/gmark.png diff --git a/static/glight.png b/static/glight.png new file mode 100755 index 0000000000000000000000000000000000000000..628da97c70890c73e59204f5b140c4e67671e92d GIT binary patch literal 1571 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 literal 0 HcmV?d00001 From 6309fcaa4f06a81dcff7d35dd886a64fa43b6bad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Thu, 12 Feb 2015 23:33:07 +0100 Subject: [PATCH 06/19] =?UTF-8?q?s=C3=A5nn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/youtube.js | 1 + static/style.css | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/js/youtube.js b/js/youtube.js index 32f0ba98..fd582f0b 100755 --- a/js/youtube.js +++ b/js/youtube.js @@ -95,6 +95,7 @@ $(document).ready(function() }); function onYouTubeIframeAPIReady() { + $("#change").css("-webkit-transition", "opacity 1s"); $("#change").css("opacity", "1"); ytplayer = new YT.Player('player', { height: window.height*0.75, diff --git a/static/style.css b/static/style.css index 94c3b598..663f0ad2 100755 --- a/static/style.css +++ b/static/style.css @@ -36,8 +36,8 @@ body { } #change { - opacity:0; - -webkit-transition: opacity 1s; + opacity:1; + /*-webkit-transition: opacity 1s;*/ } /*#change{ display: table-cell; vertical-align: middle;}*/ From ae84db5677aa5250472166b47cbcc535dc3d9b55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Thu, 12 Feb 2015 23:36:06 +0100 Subject: [PATCH 07/19] added playlist on fadein --- js/youtube.js | 1 + static/style.css | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/js/youtube.js b/js/youtube.js index fd582f0b..76c3c8a3 100755 --- a/js/youtube.js +++ b/js/youtube.js @@ -354,6 +354,7 @@ function onPlayerReady(event) { { $("#player").css("opacity", "1"); $("#controls").css("opacity", "1"); + $(".playlist").css("opacity", "1"); //$("#player").fadeIn(); ytplayer.playVideo(); } diff --git a/static/style.css b/static/style.css index 663f0ad2..c91a9bba 100755 --- a/static/style.css +++ b/static/style.css @@ -295,7 +295,9 @@ body { font-size:14px; border-radius:3px; vertical-align:top; - height:calc(87% - 183px) + height:calc(87% - 183px); + opacity:0; + -webkit-transition:opacity 1s; } .lresult { From 0f4bd9ec25b610a3cdb9870f589d0219f1e68e23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Thu, 12 Feb 2015 23:38:26 +0100 Subject: [PATCH 08/19] pink? --- static/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/style.css b/static/style.css index c91a9bba..6c264aaa 100755 --- a/static/style.css +++ b/static/style.css @@ -4,7 +4,7 @@ body { } ::selection { - background:grey + background:#DB17E0; /* WebKit/Blink Browsers */ } From 14f4bf8b8abf82f10cfbc0c8c5f8609eb0d64237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Fri, 13 Feb 2015 00:11:39 +0100 Subject: [PATCH 09/19] changed number of channel on frontpage --- php/nochan.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/nochan.php b/php/nochan.php index 94ef8afd..04fe38c1 100755 --- a/php/nochan.php +++ b/php/nochan.php @@ -37,7 +37,7 @@ foreach($fil as $files){ } $i++; array_push($all_channels, ucfirst(str_replace(".json", "", $files))); - if($i > 13) + if($i > 16) { $tooMany = true; break; From fad2cd96dac4626174e2cf1b033574b8271fce42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Fri, 13 Feb 2015 00:54:05 +0100 Subject: [PATCH 10/19] Fixed so datalist still contains all channels --- php/nochan.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/php/nochan.php b/php/nochan.php index 04fe38c1..18ae2fe2 100755 --- a/php/nochan.php +++ b/php/nochan.php @@ -31,17 +31,13 @@ foreach($fil as $files){ if($time_lasted < $time){ $file = file_get_contents($files); //Checking if the channel has the setting for showing on the frontpage set to true. $data = json_decode($file, TRUE); - if(!array_key_exists("frontpage", $data['conf']) || $data['conf']['frontpage'] == "true"){ //If it is true, the channelname will be shown on the frontpage + if(!array_key_exists("frontpage", $data['conf']) || $data['conf']['frontpage'] == "true" && $i <= 16){ //If it is true, the channelname will be shown on the frontpage array_push($channels, ucfirst(str_replace(".json", "", $files))); } } $i++; array_push($all_channels, ucfirst(str_replace(".json", "", $files))); - if($i > 16) - { - $tooMany = true; - break; - } + } } @@ -74,7 +70,7 @@ foreach($fil as $files){
Active Channels
- ".htmlspecialchars($channel)."";} if($tooMany) echo "..."; ?> + ".htmlspecialchars($channel)."";} ?>
From ac5c945ccdddf1cbdd27690df80293fa996d71e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Fri, 13 Feb 2015 00:54:51 +0100 Subject: [PATCH 11/19] Fixed so datalist still contains all channels --- php/nochan.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/nochan.php b/php/nochan.php index 18ae2fe2..71719f7b 100755 --- a/php/nochan.php +++ b/php/nochan.php @@ -31,7 +31,7 @@ foreach($fil as $files){ if($time_lasted < $time){ $file = file_get_contents($files); //Checking if the channel has the setting for showing on the frontpage set to true. $data = json_decode($file, TRUE); - if(!array_key_exists("frontpage", $data['conf']) || $data['conf']['frontpage'] == "true" && $i <= 16){ //If it is true, the channelname will be shown on the frontpage + if(!array_key_exists("frontpage", $data['conf']) || $data['conf']['frontpage'] == "true" && $i <= 14){ //If it is true, the channelname will be shown on the frontpage array_push($channels, ucfirst(str_replace(".json", "", $files))); } } From 2e3b2f4d4eef7fa5bbd22043ec7b031c777d57e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Fri, 13 Feb 2015 00:56:47 +0100 Subject: [PATCH 12/19] Fixed so datalist still contains all channels --- php/nochan.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/nochan.php b/php/nochan.php index 71719f7b..eeccc977 100755 --- a/php/nochan.php +++ b/php/nochan.php @@ -31,7 +31,7 @@ foreach($fil as $files){ if($time_lasted < $time){ $file = file_get_contents($files); //Checking if the channel has the setting for showing on the frontpage set to true. $data = json_decode($file, TRUE); - if(!array_key_exists("frontpage", $data['conf']) || $data['conf']['frontpage'] == "true" && $i <= 14){ //If it is true, the channelname will be shown on the frontpage + if(!array_key_exists("frontpage", $data['conf']) || $data['conf']['frontpage'] == "true" && $i <= 8){ //If it is true, the channelname will be shown on the frontpage array_push($channels, ucfirst(str_replace(".json", "", $files))); } } From 4ad797554ccee14ec1ed85ff0e8f79f1cec014d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Fri, 13 Feb 2015 01:41:06 +0100 Subject: [PATCH 13/19] spinning? --- js/youtube.js | 5 +---- php/nochan.php | 7 +++++++ static/style.css | 6 +++++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/js/youtube.js b/js/youtube.js index 76c3c8a3..f4e160d1 100755 --- a/js/youtube.js +++ b/js/youtube.js @@ -253,10 +253,7 @@ function getTime() } ytplayer.seekTo(timeDifference[0]); ytplayer.pauseVideo(); - if(!window.mobilecheck()) - { - ytplayer.playVideo(); - } + ytplayer.playVideo(); getTitle(); return false; } diff --git a/php/nochan.php b/php/nochan.php index eeccc977..cc90a938 100755 --- a/php/nochan.php +++ b/php/nochan.php @@ -76,5 +76,12 @@ foreach($fil as $files){
© Nixo & KasperRT
+ diff --git a/static/style.css b/static/style.css index 6c264aaa..55990900 100755 --- a/static/style.css +++ b/static/style.css @@ -514,7 +514,11 @@ input[type="radio"] { } #zicon { - width:15% + width:15%; + -moz-transition: all 0.5s ease; + -webkit-transition: all 0.5s ease; + -o-transition: all 0.5s ease; + transition: all 0.5s ease; } .fchan { From 38fd17a4f15440db3a51fab817787e35f555192e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Fri, 13 Feb 2015 01:43:18 +0100 Subject: [PATCH 14/19] Making shit annoying as fuck --- php/nochan.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/nochan.php b/php/nochan.php index cc90a938..48e9a012 100755 --- a/php/nochan.php +++ b/php/nochan.php @@ -79,7 +79,7 @@ foreach($fil as $files){ From fd31cf105d0647bcd1117485f82f3381c200a4b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Fri, 13 Feb 2015 10:48:08 +0100 Subject: [PATCH 15/19] Less backgrounds in the randomfunc --- php/header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/header.php b/php/header.php index f66c5754..4d5e5e9b 100755 --- a/php/header.php +++ b/php/header.php @@ -5,7 +5,7 @@ --> Date: Fri, 13 Feb 2015 11:17:18 +0100 Subject: [PATCH 16/19] Bigger and better --- php/nochan.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/php/nochan.php b/php/nochan.php index 48e9a012..71d9e40d 100755 --- a/php/nochan.php +++ b/php/nochan.php @@ -78,9 +78,12 @@ foreach($fil as $files){
© Nixo & KasperRT
From 0afdb941a2fb42c052791c529d4ef4909596c128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Fri, 13 Feb 2015 11:21:30 +0100 Subject: [PATCH 17/19] gofuckyourself --- php/nochan.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/php/nochan.php b/php/nochan.php index 71d9e40d..7d67b53c 100755 --- a/php/nochan.php +++ b/php/nochan.php @@ -84,6 +84,8 @@ foreach($fil as $files){ pr = pr + 0.5; document.getElementById("zicon").style.transform = "rotate("+deg+"deg)"; document.getElementById("zicon").style.width = pr+"%"; + if(pr >= 150) + window.location.href = 'https://www.youtube.com/watch?v=mK2fNG26xFg'; }); From 38b3a1517674c73d1c9498fb49b9b0362a383181 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Fri, 13 Feb 2015 11:23:09 +0100 Subject: [PATCH 18/19] 60 --- php/nochan.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/nochan.php b/php/nochan.php index 7d67b53c..d39d2c12 100755 --- a/php/nochan.php +++ b/php/nochan.php @@ -84,7 +84,7 @@ foreach($fil as $files){ pr = pr + 0.5; document.getElementById("zicon").style.transform = "rotate("+deg+"deg)"; document.getElementById("zicon").style.width = pr+"%"; - if(pr >= 150) + if(pr >= 60) window.location.href = 'https://www.youtube.com/watch?v=mK2fNG26xFg'; }); From 4ca0561b5aacfe5b4a2938eb6dbf21e62e3fdfdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Fri, 13 Feb 2015 12:05:23 +0100 Subject: [PATCH 19/19] temp removing chanbug --- index.php | 8 +++++++- php/nochan.php | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/index.php b/index.php index b2be6927..9608c0fa 100755 --- a/index.php +++ b/index.php @@ -1,4 +1,10 @@ = 60) - window.location.href = 'https://www.youtube.com/watch?v=mK2fNG26xFg'; + window.location.href = 'https://www.youtube.com/v/mK2fNG26xFg?autoplay=1&showinfo=0&autohide=1'; });