").parent().html()),$("#video-container").append($($($(a[0]).html())[4]).clone().wrap("
").parent().html()),$("#main-row").append("
"),$("#player").removeClass("player_bottom"),$("#main-row").removeClass("frontpage_modified_heights"),$("#main_section_frontpage").remove(),$("#closePlayer").remove()}$("#search").attr("placeholder","Find song on YouTube..."),$(".page-footer").addClass("padding-bottom-novideo"),1==$("#alreadychannel").length?e():(we=!0,e()),0==$("#alreadyfp").length&&$("head").append("
")}})}};String.prototype.capitalizeFirstLetter=function(){return this.charAt(0).toUpperCase()+this.slice(1)};var Te={loaded:!0,before_load:"",after_load:"",ytplayer:"",stopInterval:!1,youtube_listener:function(e){if(Te.loaded=!1,0==e.length){document.getElementById("song-title").innerHTML="Empty channel. Add some songs!",$("#player_overlay").height($("#player").height()),window.MSStream||$("#player_overlay").toggleClass("hide");try{Te.ytplayer.stopVideo()}catch(t){}}else{void 0==q?q=e[0][0].id:q!=A&&(q=A),A=e[0][0].id,B=e[1][0],time=e[2],D=time-B.startTime,j=e[0][0].title,duration=e[0][0].duration,I&&k.mobilecheck()&&0==D&&(D=1);try{E[0].id==A&&Y.song_change(E[0].added),xe.fetchYoutubeSuggests(A)}catch(t){}if(Te.getTitle(j,N),Te.setBGimage(A),ae&&!window.MSStream)try{Te.ytplayer.getVideoUrl().split("v=")[1]!=A&&(Te.ytplayer.loadVideoById(A),Te.notifyUser(A,j),Te.ytplayer.seekTo(D),ie&&Te.ytplayer.pauseVideo()),ie||(I||Te.ytplayer.playVideo(),ge||Te.durationSetter()),(Te.ytplayer.getDuration()>D||0==Te.ytplayer.getDuration())&&Te.ytplayer.seekTo(D),Te.after_load=A,setTimeout(function(){Te.loaded=!0},500)}catch(t){ge||Te.durationSetter()}else Te.getTitle(j,N)}},onPlayerStateChange:function(e){switch(e.data){case-1:break;case 0:se=!1,ie=!1,H.emit("end",{id:A,channel:R.toLowerCase()});break;case 1:se=!0,beginning&&k.mobilecheck()&&(Te.ytplayer.pauseVideo(),beginning=!1,I=!1),pe||"/"==window.location.pathname||k.addClass("#player_overlay","hide"),"/"!=window.location.pathname&&(1==document.getElementById("play").className.split(" ").length&&$("#play").toggleClass("hide"),2==document.getElementById("pause").className.split(" ").length&&$("#pause").toggleClass("hide")),ie&&(H.emit("pos",{channel:R.toLowerCase()}),ie=!1);break;case 2:ie=!0,"/"!=window.location.pathname&&Se.play_pause_show(),I=!0;break;case 3:}},getTitle:function(e,t){var o=t>1?"viewers":"viewer",n=decodeURIComponent(e);if("/"!=window.location.pathname){var a=document.getElementById("song-title"),i=document.getElementById("viewers");a.innerHTML=n,i.innerHTML=t+" "+o,a.title=n+" • "+t+" "+o}document.title=n+" • Zöff / "+R},errorHandler:function(e){5==e.data||100==e.data||101==e.data||150==e.data?(curr_playing=Te.ytplayer.getVideoUrl().replace("https://www.youtube.com/watch?v=",""),H.emit("skip",{error:e.data,id:A,pass:oe,channel:R.toLowerCase})):void 0!==A&&Te.ytplayer.loadVideoById(A)},onPlayerReady:function(e){$("#channel-load").css("display","none");try{beginning=!0,ae=!0,window.MSStream||($("#player").css("opacity","1"),$("#controls").css("opacity","1"),$(".playlist").css("opacity","1"),Te.ytplayer.loadVideoById(A),me&&!k.mobilecheck()&&Te.ytplayer.playVideo(),ge||Te.durationSetter(),pe?setTimeout(function(){Te.ytplayer.seekTo(D),me||(Te.ytplayer.pauseVideo(),Se.play_pause_show())},1e3):Te.ytplayer.seekTo(D)),Te.readyLooks(),Se.initYoutubeControls(Te.ytplayer),Se.initSlider(),Te.ytplayer.setVolume(w.get_volume()),$(".video-container").removeClass("no-opacity")}catch(t){}},readyLooks:function(){Te.setBGimage(A)},setBGimage:function(e){if(void 0!==e&&!pe){var t=new Image;t.onload=function(){var e=new ColorThief,o=e.getColor(t);"/"!=window.location.pathname&&(document.getElementsByTagName("body")[0].style.backgroundColor=k.rgbToHsl(o,!0),$("meta[name=theme-color]").attr("content",k.rgbToHex(o[0],o[1],o[2])))},t.crossOrigin="Anonymous",t.src="https://zoff.no:8080/https://img.youtube.com/vi/"+e+"/mqdefault.jpg"}},set_width:function(e){$(".video-container").width(e)},notifyUser:function(e,t){if(t=t.replace(/\\\'/g,"'").replace(/"/g,"'").replace(/&/g,"&"),"granted"===Notification.permission&&document.hidden){var o=new Notification("Now Playing",{body:t,icon:"http://i.ytimg.com/vi/"+e+"/mqdefault.jpg",iconUrl:"http://i.ytimg.com/vi/"+e+"/mqdefault.jpg"});o.onclick=function(e){window.focus(),this.cancel()},setTimeout(function(){o.close()},5e3)}},setup_all_listeners:function(){o(),t(),i(),s(),l()},onYouTubeIframeAPIReady:function(){Te.ytplayer=new YT.Player("player",{videoId:A,playerVars:{rel:"0",wmode:"transparent",controls:"0",iv_load_policy:"3",theme:"light",color:"white",showinfo:0},events:{onReady:Te.onPlayerReady,onStateChange:Te.onPlayerStateChange,onError:Te.errorHandler}})},durationSetter:function(){if(void 0!=duration)try{Te.stopInterval||(ge=!0),dMinutes=Math.floor(duration/60),dSeconds=duration-60*dMinutes,currDurr=void 0!=Te.ytplayer.getCurrentTime()?Math.floor(Te.ytplayer.getCurrentTime()):D,currDurr>duration&&(currDurr=duration),minutes=Math.floor(currDurr/60),seconds=currDurr-60*minutes,document.getElementById("duration").innerHTML=k.pad(minutes)+":"+k.pad(seconds)+"
/ "+k.pad(dMinutes)+":"+k.pad(dSeconds),per=100/duration*currDurr,per>=100?per=100:0==duration&&(per=0),$("#bar").width(per+"%")}catch(e){}Te.stopInterval||setTimeout(Te.durationSetter,1e3)},loadPlayer:function(){1==$("script[src='https://www.youtube.com/iframe_api']").length?Te.onYouTubeIframeAPIReady():(M=document.createElement("script"),M.src="https://www.youtube.com/iframe_api",P=document.getElementsByTagName("script")[0],P.parentNode.insertBefore(M,P))}},Se={stopInterval:!1,initYoutubeControls:function(){!k.mobilecheck()||/iPad|iPhone|iPod/.test(navigator.userAgent)||window.MSStream||$("#controls").appendTo("#playbar"),Se.initControls()},initControls:function(){document.getElementById("volume-button").addEventListener("click",Se.mute_video),document.getElementById("playpause").addEventListener("click",Se.play_pause),document.getElementById("fullscreen").addEventListener("click",Se.fullscreen)},initSlider:function(){try{vol=w.get_volume()}catch(e){}$("#volume").slider({min:0,max:100,value:vol,range:"min",animate:!0,slide:function(e,t){Se.setVolume(t.value);try{w.set_volume(t.value)}catch(o){}}}),Se.choose_button(vol,!1)},fullscreen:function(){var e=document.getElementById("player"),t=e.requestFullScreen||e.mozRequestFullScreen||e.webkitRequestFullScreen;t&&t.bind(e)()},play_pause:function(){1==Te.ytplayer.getPlayerState()?(Te.ytplayer.pauseVideo(),!k.mobilecheck()||/iPad|iPhone|iPod/.test(navigator.userAgent)||window.MSStream||(document.getElementById("player").style.display="none",$(".video-container").toggleClass("click-through"),$(".page-footer").toggleClass("padding-bottom-extra"))):(2==Te.ytplayer.getPlayerState()||0==Te.ytplayer.getPlayerState())&&(Te.ytplayer.playVideo(),!k.mobilecheck()||/iPad|iPhone|iPod/.test(navigator.userAgent)||window.MSStream||(document.getElementById("player").style.display="block",$(".video-container").toggleClass("click-through"),$(".page-footer").toggleClass("padding-bottom-extra")))},play_pause_show:function(){1==document.getElementById("pause").className.split(" ").length&&$("#pause").toggleClass("hide"),2==document.getElementById("play").className.split(" ").length&&$("#play").toggleClass("hide")},settings:function(){$("#qS").toggleClass("hide")},changeQuality:function(e){Te.ytplayer.getPlaybackQuality!=e&&(Te.ytplayer.setPlaybackQuality(e),Te.ytplayer.getPlaybackQuality()),$("#qS").toggleClass("hide")},mute_video:function(){Te.ytplayer.isMuted()?(Te.ytplayer.unMute(),Se.choose_button(Te.ytplayer.getVolume(),!1)):(Se.choose_button(0,!0),Te.ytplayer.mute())},setVolume:function(e){Te.ytplayer.setVolume(e),Se.choose_button(e,!1),Te.ytplayer.isMuted()&&Te.ytplayer.unMute()},choose_button:function(e,t){t?(1==document.getElementById("v-full").className.split(" ").length&&$("#v-full").toggleClass("hide"),1==document.getElementById("v-medium").className.split(" ").length&&$("#v-medium").toggleClass("hide"),1==document.getElementById("v-low").className.split(" ").length&&$("#v-low").toggleClass("hide"),2==document.getElementById("v-mute").className.split(" ").length&&$("#v-mute").toggleClass("hide")):e>=0&&33>=e?(1==document.getElementById("v-full").className.split(" ").length&&$("#v-full").toggleClass("hide"),1==document.getElementById("v-medium").className.split(" ").length&&$("#v-medium").toggleClass("hide"),2==document.getElementById("v-low").className.split(" ").length&&$("#v-low").toggleClass("hide"),1==document.getElementById("v-mute").className.split(" ").length&&$("#v-mute").toggleClass("hide")):e>=34&&66>=e?(1==document.getElementById("v-full").className.split(" ").length&&$("#v-full").toggleClass("hide"),2==document.getElementById("v-medium").className.split(" ").length&&$("#v-medium").toggleClass("hide"),1==document.getElementById("v-low").className.split(" ").length&&$("#v-low").toggleClass("hide"),1==document.getElementById("v-mute").className.split(" ").length&&$("#v-mute").toggleClass("hide")):e>=67&&100>=e&&(2==document.getElementById("v-full").className.split(" ").length&&$("#v-full").toggleClass("hide"),1==document.getElementById("v-medium").className.split(" ").length&&$("#v-medium").toggleClass("hide"),1==document.getElementById("v-low").className.split(" ").length&&$("#v-low").toggleClass("hide"),1==document.getElementById("v-mute").className.split(" ").length&&$("#v-mute").toggleClass("hide"))},playPause:function(){state=Te.ytplayer.getPlayerState(),button=document.getElementById("playpause"),1==state?Te.ytplayer.pauseVideo():2==state&&Te.ytplayer.playVideo()},volumeOptions:function(){Te.ytplayer.isMuted()?(Te.ytplayer.unMute(),vol=Te.ytplayer.getVolume(),$("#volume").slider("value",Te.ytplayer.getVolume())):(Te.ytplayer.mute(),$("#volume").slider("value",0))},hoverMute:function(e){vol=Te.ytplayer.getVolume()}},Ee={showSearch:function(){$("#search-wrapper").toggleClass("hide"),k.mobilecheck()&&$(".search_input").focus(),$("#song-title").toggleClass("hide"),$("#results").toggleClass("hide"),$("#results").empty(),$("#search-btn i").toggleClass("mdi-navigation-close"),$("#search-btn i").toggleClass("mdi-action-search"),$("#search").focus()},search:function(e){if((void 0==_||void 0==C)&&(_=$("#temp-results-container"),C=$("#empty-results-container").html()),$(".search_results").html(""),""!==window.search_input){K=!0;var t=encodeURIComponent(window.search_input),o="https://www.googleapis.com/youtube/v3/search?key="+Q+"&videoEmbeddable=true&part=id&fields=items(id)&type=video&order=viewCount&safeSearch=none&maxResults=25";o+="&q="+t,ee&&(o+="&videoCategoryId=10");var n="https://www.googleapis.com/youtube/v3/videos?part=contentDetails,snippet,id&key="+Q+"&id=";k.contains($("#search_loader").attr("class").split(" "),"hide")&&$("#search_loader").removeClass("hide"),k.contains($("#results").attr("class").split(" "),"hide")&&$("#results").removeClass("hide"),$.ajax({type:"GET",url:o,dataType:"jsonp",success:function(e){0==e.items.length?($("
"+C+"
").appendTo($("#results")).show("blind",83.33),k.contains($("#search_loader").attr("class").split(" "),"hide")||$("#search_loader").addClass("hide")):e.items&&($.each(e.items,function(e,t){n+=t.id.videoId+","}),$.ajax({type:"GET",url:n,dataType:"jsonp",success:function(e){var t="",o=$(_);$.each(e.items,function(e,n){var a=n.contentDetails.duration;if(secs=Ee.durationToSeconds(a),!longsongs||secs<720){z=n.snippet.title,enc_title=z,S=n.id,a=a.replace("PT","").replace("H","h ").replace("M","m ").replace("S","s"),thumb=n.snippet.thumbnails.medium.url;var i=o;i.find(".search-title").text(z),i.find(".result_info").text(a),i.find(".thumb").attr("data-original",thumb),i.find("#add-many").attr("data-video-id",S),i.find("#add-many").attr("data-video-title",enc_title),i.find("#add-many").attr("data-video-length",secs),i.find("#temp-results").attr("data-video-id",S),i.find("#temp-results").attr("data-video-title",enc_title),i.find("#temp-results").attr("data-video-length",secs),t+=i.html()}}),$("
"+t+"
").appendTo($("#results")).show("blind",83.33*(e.items.length-1)),setTimeout(function(){$(".thumb").lazyload({container:$("#results")})},250),k.contains($("#search_loader").attr("class").split(" "),"hide")||$("#search_loader").addClass("hide"),$(".add-many").click(function(e){return e.preventDefault(),e.stopPropagation(),!1})}}))}})}else $(".main").removeClass("blurT"),$("#controls").removeClass("blurT"),$(".main").removeClass("clickthrough")},submitAndClose:function(e,t,o){Ee.submit(e,t,o),$("#results").html(""),Ee.showSearch(),document.getElementById("search").value="",$("#results").html="",$(".main").removeClass("blurT"),$("#controls").removeClass("blurT"),$(".main").removeClass("clickthrough")},importPlaylist:function(e,t){token="",void 0!==t&&(token="&pageToken="+t),playlist_url="https://www.googleapis.com/youtube/v3/playlistItems?part=contentDetails&maxResults=49&key="+Q+"&playlistId="+e+token,$.ajax({type:"GET",url:playlist_url,dataType:"jsonp",success:function(t){var o="";$.each(t.items,function(e,t){o+=t.contentDetails.videoId+","}),Ee.addVideos(o,!0),t.nextPageToken&&Ee.importPlaylist(e,t.nextPageToken),document.getElementById("import").value=""}})},addVideos:function(e,t){var o="https://www.googleapis.com/youtube/v3/videos?part=contentDetails,snippet,id&key=***REMOVED***&id=";o+=e,$.ajax({type:"POST",url:o,dataType:"jsonp",success:function(e){$.each(e.items,function(e,o){var n=Ee.durationToSeconds(o.contentDetails.duration);(!longsongs||720>n)&&(enc_title=o.snippet.title,Ee.submit(o.id,enc_title,n,t))})}})},submit:function(e,t,o,n){H.emit("add",{id:e,title:decodeURIComponent(t),adminpass:oe,list:R.toLowerCase(),duration:o,playlist:n})},durationToSeconds:function(e){var t=e.match(X);return hours=parseInt(t[12])||0,minutes=parseInt(t[14])||0,seconds=parseInt(t[16])||0,60*hours*60+60*minutes+seconds}},xe={catchUserSuggests:function(e,t){if(t)xe.createSuggested(e);else for(x in e)xe.createSuggested(e[x]);xe.checkUserEmpty()},createSuggested:function(e){var t=e.duration,o=e.id,n=e.title,a=Math.floor(t/60),i=t-60*a;duration=a+"m "+i+"s";var s=Y.generateSong({id:o,title:n,length:t,duration:duration},!1,!1,!1,!0);$("#user-suggest-html").append(s)},fetchYoutubeSuggests:function(e){var t="https://www.googleapis.com/youtube/v3/search?part=snippet&relatedToVideoId="+e+"&type=video&key="+Q,o="https://www.googleapis.com/youtube/v3/videos?part=contentDetails,snippet,id&key="+Q+"&id=";$.ajax({type:"GET",url:t,dataType:"jsonp",success:function(e){$.each(e.items.slice(0,5),function(e,t){o+=t.id.videoId+","}),$.ajax({type:"GET",url:o,dataType:"jsonp",success:function(e){$("#suggest-song-html").empty(),$.each(e.items,function(e,t){var o=t.contentDetails.duration,n=Ee.durationToSeconds(o),a=t.id,i=t.snippet.title;o=o.replace("PT","").replace("H","h ").replace("M","m ").replace("S","s"),$("#suggest-song-html").append(Y.generateSong({id:a,title:i,length:n,duration:o},!1,!1,!1))})}})}})},checkUserEmpty:function(){var e=$("#user-suggest-html").children().length;0==e?k.contains($("#user_suggests").attr("class").split(" "),"hide")||$("#user_suggests").addClass("hide"):$("#user_suggests").removeClass("hide")}}}();
\ No newline at end of file
diff --git a/static/dist/remote.min.js b/static/dist/remote.min.js
index c20e3847..dc4d4283 100755
--- a/static/dist/remote.min.js
+++ b/static/dist/remote.min.js
@@ -1 +1 @@
-!function(){var o=!0;window.mobilecheck=function(){var o=!1;return function(t){(/(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(t)||/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(t.substr(0,4)))&&(o=!0)}(navigator.userAgent||navigator.vendor||window.opera),o},$(document).ready(function(){document.title="Zöff Remote",setTimeout(function(){$("#search").focus()},500);var o={"sync disconnect on unload":!0,secure:!0};"remote.zoff.no"==window.location.hostname?add="https://zoff.no":add="localhost",socket=io.connect(add+":8880",o),id=window.location.pathname.split("/")[1],id&&(id=id.toLowerCase(),t.control()),git_info=$.ajax({type:"GET",url:"https://api.github.com/repos/zoff-music/zoff/commits",async:!1}).responseText,git_info=$.parseJSON(git_info),$("#latest-commit").html("Latest Commit:
"+git_info[0].commit.author.date.substring(0,10)+": "+git_info[0].committer.login+"
"+git_info[0].sha.substring(0,10)+": "+git_info[0].commit.message+"
"+git_info[0].commit.author.date.substring(0,10)+": "+git_info[0].committer.login+"
"+git_info[0].sha.substring(0,10)+": "+git_info[0].commit.message+"
"+inp[0]+"");
- var in_text = document.createTextNode(inp[1]);
- $("#chatall li:last")[0].appendChild(in_text);
- document.getElementById("chatall").scrollTop = document.getElementById("chatall").scrollHeight;
- });
+ }
+ color = Helper.hexToRgb(color.substring(0,6));
+ var color_temp = Helper.rgbToHsl([color.r, color.g, color.b], false);
+ $("#chatall").append("
"+inp[0]+"");
+ var in_text = document.createTextNode(inp[1]);
+ $("#chatall li:last")[0].appendChild(in_text);
+ document.getElementById("chatall").scrollTop = document.getElementById("chatall").scrollHeight;
},
- setup_chat_listener: function(channel)
+ channelchat: function(data)
{
- socket.on("chat", function(data)
+ if(!blink_interval_exists && data[1].substring(0,1) == ":" && !chat_active)
{
- if(!blink_interval_exists && data[1].substring(0,1) == ":" && !chat_active)
- {
- $("#favicon").attr("href", "static/images/highlogo.png");
- unseen = true;
- chat_unseen = true;
- if(!blinking) Chat.chat_blink();
- //blink_interval = setTimeout(Chat.chat_blink, 1000);
- }
+ $("#favicon").attr("href", "static/images/highlogo.png");
+ unseen = true;
+ chat_unseen = true;
+ if(!blinking) Chat.chat_blink();
+ //blink_interval = setTimeout(Chat.chat_blink, 1000);
+ }
- var color = Helper.intToARGB(Helper.hashCode(data[0]));
- if(color.length < 6) {
- for(x = color.length; x < 6; x++){
- color = "0" + color;
- }
+ var color = Helper.intToARGB(Helper.hashCode(data[0]));
+ if(color.length < 6) {
+ for(x = color.length; x < 6; x++){
+ color = "0" + color;
}
- color = Helper.hexToRgb(color.substring(0,6));
- var color_temp = Helper.rgbToHsl([color.r, color.g, color.b], false);
- $("#chatchannel").append("
"+data[0]+"");
- var in_text = document.createTextNode(data[1]);
- $("#chatchannel li:last")[0].appendChild(in_text);
- document.getElementById("chatchannel").scrollTop = document.getElementById("chatchannel").scrollHeight;
- });
+ }
+ color = Helper.hexToRgb(color.substring(0,6));
+ var color_temp = Helper.rgbToHsl([color.r, color.g, color.b], false);
+ $("#chatchannel").append("
"+data[0]+"");
+ var in_text = document.createTextNode(data[1]);
+ $("#chatchannel li:last")[0].appendChild(in_text);
+ document.getElementById("chatchannel").scrollTop = document.getElementById("chatchannel").scrollHeight;
+ socket.on("chat", Chat.channelchat);
},
chat_blink: function() {
diff --git a/static/js/helpers.js b/static/js/helpers.js
index 503ffb9a..8b126e8c 100755
--- a/static/js/helpers.js
+++ b/static/js/helpers.js
@@ -1,15 +1,15 @@
-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);
- return check;
-};
-
var Helper = {
rnd: function(arr)
{
return arr[Math.floor(Math.random() * arr.length)];
},
+ 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);
+ return check;
+ },
+
predicate: function() {
var fields = [],
n_fields = arguments.length,
diff --git a/static/js/hostcontroller.js b/static/js/hostcontroller.js
index c862d06a..ab9bce2b 100755
--- a/static/js/hostcontroller.js
+++ b/static/js/hostcontroller.js
@@ -2,68 +2,58 @@ var Hostcontroller = {
enabled: true,
- host_listener: function() {
+ old_id: null,
- var old_id;
+ host_listener: function(id) {
- socket.on("id", function(id)
+ if(Hostcontroller.old_id == null) Hostcontroller.old_id = id;
+ else
{
- if(old_id === undefined) old_id = id;
- else
- {
- socket.removeAllListeners(id);
- began = false;
- old_id = id;
- }
- var codeURL = "https://remote."+window.location.hostname+"/"+id;
- $("#code-text").text(id)
- $("#code-qr").attr("src", "https://chart.googleapis.com/chart?chs=221x221&cht=qr&choe=UTF-8&chld=L|1&chl="+codeURL);
- $("#code-link").attr("href", codeURL);
- if(!began)
- {
- began = true;
- socket.on(id, function(arr)
- {
-
- if(enabled){
- if(arr[0] == "volume"){
- $("#volume").slider("value", arr[1]);
- Player.ytplayer.setVolume(arr[1]);
- localStorage.setItem("volume", arr[1]);
- Playercontrols.choose_button(arr[1], false);
- }else if(arr[0] == "channel"){
- console.log("changing channel");
- socket.emit("change_channel");
- Admin.beginning = true;
-
- chan = arr[1].toLowerCase();
- $("#chan").html(Helper.upperFirst(chan));
-
- w_p = true;
- socket.emit("list", chan.toLowerCase());
-
- /*if(Crypt.get_pass(chan.toLowerCase()) !== undefined && Crypt.get_pass(chan.toLowerCase()) != ""){
- socket.emit("password", [Crypt.crypt_pass(Crypt.get_pass(chan.toLowerCase())), chan.toLowerCase()]);
- }*/
-
- window.history.pushState("object or string", "Title", "/"+chan.toLowerCase());
- }else if(arr[0] == "pause")
- Player.ytplayer.pauseVideo()
- else if(arr[0] == "play")
- Player.ytplayer.playVideo();
- else if(arr[0] == "skip")
- List.skip();
- }
- });
- }
- });
-
-
- $('input[class=remote_switch_class]').change(function()
+ socket.removeAllListeners(id);
+ began = false;
+ Hostcontroller.old_id = id;
+ }
+ var codeURL = "https://remote."+window.location.hostname+"/"+id;
+ $("#code-text").text(id)
+ $("#code-qr").attr("src", "https://chart.googleapis.com/chart?chs=221x221&cht=qr&choe=UTF-8&chld=L|1&chl="+codeURL);
+ $("#code-link").attr("href", codeURL);
+ if(!began)
{
- enabled = document.getElementsByName("remote_switch")[0].checked;
- Crypt.set_remote(enabled);
- });
+ began = true;
+ socket.on(id, function(arr)
+ {
+
+ if(enabled){
+ if(arr[0] == "volume"){
+ $("#volume").slider("value", arr[1]);
+ Player.ytplayer.setVolume(arr[1]);
+ localStorage.setItem("volume", arr[1]);
+ Playercontrols.choose_button(arr[1], false);
+ }else if(arr[0] == "channel"){
+ console.log("changing channel");
+ socket.emit("change_channel");
+ Admin.beginning = true;
+
+ chan = arr[1].toLowerCase();
+ $("#chan").html(Helper.upperFirst(chan));
+
+ w_p = true;
+ socket.emit("list", chan.toLowerCase());
+
+ /*if(Crypt.get_pass(chan.toLowerCase()) !== undefined && Crypt.get_pass(chan.toLowerCase()) != ""){
+ socket.emit("password", [Crypt.crypt_pass(Crypt.get_pass(chan.toLowerCase())), chan.toLowerCase()]);
+ }*/
+
+ window.history.pushState("object or string", "Title", "/"+chan.toLowerCase());
+ }else if(arr[0] == "pause")
+ Player.ytplayer.pauseVideo()
+ else if(arr[0] == "play")
+ Player.ytplayer.playVideo();
+ else if(arr[0] == "skip")
+ List.skip();
+ }
+ });
+ }
},
change_enabled:function(val){
diff --git a/static/js/list.js b/static/js/list.js
index 2446bd8a..c34eed71 100755
--- a/static/js/list.js
+++ b/static/js/list.js
@@ -2,13 +2,6 @@ var List = {
empty: false,
- channel_listener: function()
- {
- socket.on("channel", function(msg){
- List.channel_function(msg);
- });
- },
-
channel_function: function(msg)
{
switch(msg[0])
@@ -75,7 +68,7 @@ var List = {
if(lazy_load){
- if(window.mobilecheck()) $(".list-image").lazyload({});
+ if(Helper.mobilecheck()) $(".list-image").lazyload({});
else{
$(".list-image").lazyload({container: $("#wrapper")}).removeClass("lazy");
@@ -217,7 +210,7 @@ var List = {
},
show: function(){
- if(!window.mobilecheck())
+ if(!Helper.mobilecheck())
{
if(showToggle){
showToggle=false;
diff --git a/static/js/listeners.js b/static/js/listeners.js
index ed3278e6..69b50088 100755
--- a/static/js/listeners.js
+++ b/static/js/listeners.js
@@ -53,6 +53,8 @@ var connection_options = {
'secure': true,
'force new connection': true
};
+var fromFront = false;
+var fromChannel = false;
/*
if (navigator.serviceWorker) {
@@ -68,7 +70,23 @@ if (navigator.serviceWorker) {
}
*/
$().ready(function(){
- if(!window.fromFront && window.location.pathname != "/") init();
+ if(!fromFront && window.location.pathname != "/") init();
+ else if(!fromChannel && window.location.pathname == "/"){
+ initfp();
+ }
+
+ git_info = $.ajax({ type: "GET",
+ url: "https://api.github.com/repos/zoff-music/zoff/commits",
+ async: false
+ }).responseText;
+
+ git_info = $.parseJSON(git_info);
+ $("#latest-commit").html("Latest Commit:
"
+ + git_info[0].commit.author.date.substring(0,10)
+ + ": " + git_info[0].committer.login
+ + "
"
+ + git_info[0].sha.substring(0,10) + ": "
+ + git_info[0].commit.message+"
"
- + git_info[0].commit.author.date.substring(0,10)
- + ": " + git_info[0].committer.login
- + "
"
- + git_info[0].sha.substring(0,10) + ": "
- + git_info[0].commit.message+"
X").appendTo("#frontpage_player");
$("#player").appendTo("#frontpage_player");
Player.onYouTubeIframeAPIReady();*/
@@ -611,19 +708,19 @@ function onepage_load(){
$("header").html($($(e)[61]).html());
$($(e)[63]).insertAfter("header");
$($(e)[65]).insertAfter(".mega");
- if(window.mobilecheck()) $("main").html($($(e)[69]).html());
+ if(Helper.mobilecheck()) $("main").html($($(e)[69]).html());
else $("main").append($($($(e)[69]).html())[0]);
$(".page-footer").removeClass("padding-bottom-extra");
$(".page-footer").removeClass("padding-bottom-novideo");
$("#favicon").attr("href", "static/images/favicon.png");
if($("#alreadyfp").length == 1){
- window.initfp();
+ initfp();
}else {
- window.fromChannel = true;
+ fromChannel = true;
frontpage = true;
- window.initfp();
+ initfp();
}
if($("#alreadychannel").length == 0){
diff --git a/static/js/nochan.js b/static/js/nochan.js
index 154905fd..c868bd22 100755
--- a/static/js/nochan.js
+++ b/static/js/nochan.js
@@ -19,12 +19,6 @@ function getCookie(cname) {
}
*/
-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);
- return check;
-};
-
var Nochan = {
blob_list: [],
@@ -33,6 +27,15 @@ var Nochan = {
times_rotated: 0,
+ frontpage_function: function(msg)
+ {
+ $("#channels").empty();
+ frontpage = true;
+ Nochan.populate_channels(msg.channels);
+
+ Nochan.set_viewers(msg.viewers);
+ },
+
populate_channels: function(lists)
{
var output = "";
@@ -47,7 +50,7 @@ var Nochan = {
}
pre_card = $(channel_list);
- if(!window.mobilecheck())
+ if(!Helper.mobilecheck())
Nochan.add_backdrop(lists, 0);
for(x in lists)
@@ -225,7 +228,7 @@ var Nochan = {
window.scrollTo(0, 0);
frontpage = false;
clearTimeout(rotation_timeout);
- if(window.mobilecheck()) socket.removeAllListeners();
+ if(Helper.mobilecheck()) socket.removeAllListeners();
$("body").css("background-color", "#2d2d2d");
$.ajax({
url: new_channel + "/php/index.php",
@@ -237,7 +240,7 @@ var Nochan = {
socket.emit("change_channel", {channel: chan.toLowerCase()});
}
$("#frontpage_player").empty();
- if(window.mobilecheck()) socket.disconnect();
+ if(Helper.mobilecheck()) socket.disconnect();
if(!popstate){
window.history.pushState("to the channel!", "Title", "/" + new_channel);
@@ -250,7 +253,7 @@ var Nochan = {
$("main").attr("class", "container center-align main");
$("body").attr("id", "channelpage");
$("header").html($($(e)[61]).html());
- if($("#alreadychannel").length == 0 || window.mobilecheck() || Player.ytplayer == undefined){
+ if($("#alreadychannel").length == 0 || Helper.mobilecheck() || Player.ytplayer == undefined){
$("main").html($($(e)[65]).html());
} else {
var main = $($($($($(e)[65]).html())[0]).html());
@@ -265,10 +268,10 @@ var Nochan = {
$("#search").attr("placeholder", "Find song on YouTube...");
$(".page-footer").addClass("padding-bottom-novideo");
if($("#alreadychannel").length == 1){
- window.init();
+ init();
}else{
- window.fromFront = true;
- window.init();
+ fromFront = true;
+ init();
}
if($("#alreadyfp").length == 0) $("head").append("
");
@@ -281,12 +284,6 @@ String.prototype.capitalizeFirstLetter = function() {
return this.charAt(0).toUpperCase() + this.slice(1);
}
-$().ready(function(){
- if(!window.fromChannel && window.location.pathname == "/"){
- initfp();
- }
-});
-
function share_link_modifier_frontpage(){
$("#facebook-code-link").attr("href", "https://www.facebook.com/sharer/sharer.php?u=https://zoff.no/");
$("#facebook-code-link").attr("onclick", "window.open('https://www.facebook.com/sharer/sharer.php?u=https://zoff.no/', 'Share Zöff','width=600,height=300'); return false;");
@@ -326,15 +323,9 @@ function initfp(){
if(window.location.hostname == "zoff.no") add = "https://zoff.no";
else add = window.location.hostname;
- if(socket == undefined || window.mobilecheck()) socket = io.connect(''+add+':8880', connection_options);
- if($("#alreadyfp").length == 0 || window.mobilecheck()){
- socket.on('playlists', function(msg){
- $("#channels").empty();
- frontpage = true;
- Nochan.populate_channels(msg.channels);
-
- Nochan.set_viewers(msg.viewers);
- });
+ if(socket == undefined || Helper.mobilecheck()) socket = io.connect(''+add+':8880', connection_options);
+ if($("#alreadyfp").length == 0 || Helper.mobilecheck()){
+ setup_playlist_listener();
}
@@ -361,97 +352,5 @@ function initfp(){
window.location.href = 'http://etys.no';
});
- if(!window.mobilecheck() && Nochan.winter) Nochan.start_snowfall();
-
- /*if(navigator.userAgent.toLowerCase().indexOf("android") > -1){
- //console.log("android");
- if(Nochan.getCookie("show_prompt") == ""){
- var r = confirm("Do you want to download the native app for this webpage?");
- if(r)
- window.location.href = 'https://play.google.com/store/apps/details?id=no.lqasse.zoff';
- else
- {
- var d = new Date();
- d.setTime(d.getTime() + (10*24*60*60*1000));
- var expires = "expires="+d.toUTCString();
- document.cookie = "show_prompt=false;"+expires;
- }
- }
- }*/
-
- git_info = $.ajax({ type: "GET",
- url: "https://api.github.com/repos/zoff-music/zoff/commits",
- async: false
- }).responseText;
-
- git_info = $.parseJSON(git_info);
- $("#latest-commit").html("Latest Commit:
"
- + git_info[0].commit.author.date.substring(0,10)
- + ": " + git_info[0].committer.login
- + "
"
- + git_info[0].sha.substring(0,10) + ": "
- + git_info[0].commit.message+"
seekTo || Player.ytplayer.getDuration() == 0)
- Player.ytplayer.seekTo(seekTo);
- Player.after_load = video_id;
-
- setTimeout(function(){Player.loaded = true;},500);
- }catch(e){
+ if(!paused){
+ if(!mobile_beginning)
+ Player.ytplayer.playVideo();
if(!durationBegun)
Player.durationSetter();
}
- }
- else
- Player.getTitle(song_title, viewers);
- }
- });
+ if(Player.ytplayer.getDuration() > seekTo || Player.ytplayer.getDuration() == 0)
+ Player.ytplayer.seekTo(seekTo);
+ Player.after_load = video_id;
+ setTimeout(function(){Player.loaded = true;},500);
+ }catch(e){
+ if(!durationBegun)
+ Player.durationSetter();
+ }
+ }
+ else
+ Player.getTitle(song_title, viewers);
+ }
},
onPlayerStateChange: function(newState) {
@@ -98,7 +94,7 @@ var Player = {
break;
case 1:
playing = true;
- if(beginning && window.mobilecheck()){
+ if(beginning && Helper.mobilecheck()){
Player.ytplayer.pauseVideo();
beginning = false;
mobile_beginning = false;
@@ -117,7 +113,7 @@ var Player = {
}
break;
case 2:
- /*if(window.mobilecheck() || embed)
+ /*if(Helper.mobilecheck() || embed)
{*/
paused = true;
if(window.location.pathname != "/") Playercontrols.play_pause_show();
@@ -187,7 +183,7 @@ var Player = {
$("#controls").css("opacity", "1");
$(".playlist").css("opacity", "1");
Player.ytplayer.loadVideoById(video_id);
- if(autoplay && !window.mobilecheck())
+ if(autoplay && !Helper.mobilecheck())
Player.ytplayer.playVideo();
if(!durationBegun)
Player.durationSetter();
@@ -254,14 +250,11 @@ var Player = {
setup_all_listeners: function()
{
- socket.on("get_list", function(){
- socket.emit('list', chan.toLowerCase());
- });
- Player.setup_youtube_listener(chan);
- Admin.admin_listener();
- Chat.setup_chat_listener(chan);
- Chat.allchat_listener();
- List.channel_listener();
+ get_list_listener();
+ setup_youtube_listener();
+ setup_admin_listener();
+ setup_chat_listener();
+ setup_list_listener();
},
onYouTubeIframeAPIReady: function() {
diff --git a/static/js/playercontrols.js b/static/js/playercontrols.js
index 44ec26e7..2593d8dd 100755
--- a/static/js/playercontrols.js
+++ b/static/js/playercontrols.js
@@ -4,7 +4,7 @@ var Playercontrols = {
initYoutubeControls: function()
{
- if(window.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){
+ if(Helper.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){
$("#controls").appendTo("#playbar");
}
Playercontrols.initControls();
@@ -55,7 +55,7 @@ var Playercontrols = {
if(Player.ytplayer.getPlayerState() == 1)
{
Player.ytplayer.pauseVideo();
- if(window.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){
+ if(Helper.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){
document.getElementById("player").style.display = "none";
$(".video-container").toggleClass("click-through");
$(".page-footer").toggleClass("padding-bottom-extra");
@@ -63,7 +63,7 @@ var Playercontrols = {
}else if(Player.ytplayer.getPlayerState() == 2 || Player.ytplayer.getPlayerState() == 0)
{
Player.ytplayer.playVideo();
- if(window.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){
+ if(Helper.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){
document.getElementById("player").style.display = "block";
$(".video-container").toggleClass("click-through");
$(".page-footer").toggleClass("padding-bottom-extra");
diff --git a/static/js/remotecontroller.js b/static/js/remotecontroller.js
index 0b96dc79..be8f72c5 100755
--- a/static/js/remotecontroller.js
+++ b/static/js/remotecontroller.js
@@ -1,6 +1,6 @@
var start = true;
-window.mobilecheck = function() {
+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);
return check;
@@ -38,7 +38,7 @@ $(document).ready(function (){
/*var _isChrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1;
setTimeout(function(){
- if (_isChrome && !document.getElementById('extension-is-installed') && !window.mobilecheck())
+ if (_isChrome && !document.getElementById('extension-is-installed') && !mobilecheck())
Materialize.toast("
Install the extension!", 100000);
}, 5);
window.installRemote = installRemote;
diff --git a/static/js/search.js b/static/js/search.js
index 8647cd6b..54eaf696 100755
--- a/static/js/search.js
+++ b/static/js/search.js
@@ -2,7 +2,7 @@ var Search = {
showSearch: function(){
$("#search-wrapper").toggleClass("hide");
- if(window.mobilecheck())
+ if(Helper.mobilecheck())
{
$(".search_input").focus();
}