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 bug with remote changing channel

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2015-06-23 20:07:07 +02:00
parent a1051b6828
commit d4525bb936
3 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
php/footer.php
View File

@@ -66,7 +66,7 @@
<script type="text/javascript" src="https://cdn.socket.io/socket.io-1.3.5.js"></script>
<!--<script type="text/javascript" src="/static/js/lib/iscroll-min.js"></script>-->
<script type="text/javascript" src="https://crypto-js.googlecode.com/svn/tags/3.1.2/build/rollups/sha256.js"></script>
<script type="text/javascript" src="/static/js/zoff-mini.js"></script>
<script type="text/javascript" src="/static/js/zoff.js"></script>
<!--<script type="text/javascript" src="/static/js/list.js"></script>
<script type="text/javascript" src="/static/js/searchlist.js"></script>
<script type="text/javascript" src="/static/js/playercontrols.js"></script>

2
static/js/zoff-mini.js
View File

File diff suppressed because one or more lines are too long

18
static/js/zoff.js
View File

@@ -58,8 +58,6 @@
(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; };
console.log("asd");
$(document).ready(function()
{
Youtube.loadPlayer();
@@ -166,8 +164,6 @@
}
}else if(event.keyCode == 13)
{
//console.log(search_input);
//console.log(search_input.split("list=")[1]);
pId = search_input.split("list=");
if(pId.length > 1)
{
@@ -340,7 +336,6 @@
channel_function: function(msg)
{
//console.log(msg);
if(msg[0] == "list")
{
full_playlist = msg[1];
@@ -596,7 +591,6 @@
{
socket.on("toast", function(msg)
{
console.log("Got message from server: "+msg);
pass_corr = "correct";
switch(msg) {
case "addedsong":
@@ -905,9 +899,6 @@
changeQuality: function(wantedQ)
{
//wantedQ = this.getAttribute("name");
//console.log("Change quality");
//console.log(wantedQ);
if(ytplayer.getPlaybackQuality != wantedQ)
{
ytplayer.setPlaybackQuality(wantedQ);
@@ -1032,11 +1023,6 @@
{
vol = ytplayer.getVolume();
},
logQ: function()
{
console.log(ytplayer.getPlaybackQuality());
}
}
@@ -1387,7 +1373,7 @@
setup_all_listeners: function()
{
socket.on("get_list", function(){
socket.emit('list', chan);
socket.emit('list', chan.toLowerCase());
});
Youtube.setup_youtube_listener(chan);
Admin.admin_listener();
@@ -1469,7 +1455,7 @@
List.channel_listener();
List.skipping_listener();
socket.emit("list", chan.toLowerCase()+",unused");
socket.emit("list", chan.toLowerCase());
window.history.pushState("object or string", "Title", "/"+chan.toLowerCase());
}else if(arr[0] == "pause")