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 error where classes were applied multiple times

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2016-04-28 13:06:37 +02:00
parent f5906e388b
commit 19a528842b
5 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
index.php
View File

@@ -200,11 +200,11 @@
<div id="playlist" class="col s12 m3"> <div id="playlist" class="col s12 m3">
<div id="top-button" title="Scroll to the top" class="rounded-bottom hide top-button-with-tabs hide-on-small-only">Top</div> <div id="top-button" title="Scroll to the top" class="rounded-bottom hide top-button-with-tabs hide-on-small-only">Top</div>
<div id="bottom-button" title="Scroll to the bottom" class="rounded-top hide hide-on-small-only">Bottom</div> <div id="bottom-button" title="Scroll to the bottom" class="rounded-top hide hide-on-small-only">Bottom</div>
<ul class="tabs playlist-tabs hide" style="width:96%"> <ul class="tabs playlist-tabs" style="width:96%">
<li class="tab col s3"><a class="playlist-tab-links playlist-link active" href="#wrapper">Playlist</a></li> <li class="tab col s3"><a class="playlist-tab-links playlist-link active" href="#wrapper">Playlist</a></li>
<li class="tab col s3"><a class="playlist-tab-links chat-link" href="#chat">Chat</a></li> <li class="tab col s3"><a class="playlist-tab-links chat-link" href="#chat">Chat</a></li>
</ul> </ul>
<ul class="tabs playlist-tabs-loggedIn" style="width: 96%;"> <ul class="tabs playlist-tabs-loggedIn hide" style="width: 96%;">
<li class="tab col s3"><a class="playlist-tab-links playlist-link active" href="#wrapper">Playlist</a></li> <li class="tab col s3"><a class="playlist-tab-links playlist-link active" href="#wrapper">Playlist</a></li>
<li class="tab col s3"><a class="playlist-tab-links suggested-link" href="#suggestions">Suggested</a></li> <li class="tab col s3"><a class="playlist-tab-links suggested-link" href="#suggestions">Suggested</a></li>
<li class="tab col s3"><a class="playlist-tab-links chat-link" href="#chat">Chat</a></li> <li class="tab col s3"><a class="playlist-tab-links chat-link" href="#chat">Chat</a></li>

5
service-worker.js
View File

@@ -1,6 +1,6 @@
//importScripts('/static/dist/lib/cache-polyfill.js'); //importScripts('/static/dist/lib/cache-polyfill.js');
var version = 'v1.0.1'; var version = 'v1.0.2';
var CACHE_FILES = [ var CACHE_FILES = [
'https://chart.googleapis.com/chart?chs=150x150&cht=qr&chl=https://zoff.no/&choe=UTF-8&chld=L%7C1', 'https://chart.googleapis.com/chart?chs=150x150&cht=qr&chl=https://zoff.no/&choe=UTF-8&chld=L%7C1',
'https://fonts.googleapis.com/icon?family=Material+Icons', 'https://fonts.googleapis.com/icon?family=Material+Icons',
@@ -171,7 +171,8 @@ self.addEventListener("fetch", function(event) {
event.request.url.indexOf("php/") == -1 && event.request.url.indexOf("php/") == -1 &&
event.request.url.indexOf("/static/") == -1 && event.request.url.indexOf("/static/") == -1 &&
event.request.url.indexOf("https://zoff.no/") == -1 && event.request.url.indexOf("https://zoff.no/") == -1 &&
event.request.url.indexOf("http://localhost/") == -1) { event.request.url.indexOf("http://localhost/") == -1 &&
event.request.url.indexOf("cdn.socket.io") == -1) {
cache.put(event.request, cacheCopy); cache.put(event.request, cacheCopy);
} }
}) })

2
static/dist/embed.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

6
static/js/admin.js
View File

@@ -83,8 +83,10 @@ var Admin = {
$("#password").val(""); $("#password").val("");
$("#password").attr("placeholder", "Change channel password") $("#password").attr("placeholder", "Change channel password")
//if(!window.mobilecheck()){ //if(!window.mobilecheck()){
if(!Helper.contains($(".playlist-tabs").attr("class").split(" "), "hide")) {
$(".playlist-tabs-loggedIn").removeClass("hide"); $(".playlist-tabs-loggedIn").removeClass("hide");
$(".playlist-tabs").addClass("hide"); $(".playlist-tabs").addClass("hide");
}
//$("#top-button").toggleClass("top-button-with-tabs"); //$("#top-button").toggleClass("top-button-with-tabs");
//$("#wrapper").toggleClass("tabs_height"); //$("#wrapper").toggleClass("tabs_height");
//} //}
@@ -199,6 +201,10 @@ var Admin = {
if((hasadmin)){ if((hasadmin)){
Admin.display_logged_out(); Admin.display_logged_out();
}else if(!hasadmin && Crypt.get_pass(chan.toLowerCase()) === undefined){ }else if(!hasadmin && Crypt.get_pass(chan.toLowerCase()) === undefined){
if(!Helper.contains($(".playlist-tabs").attr("class").split(" "), "hide")) {
$(".playlist-tabs-loggedIn").removeClass("hide");
$(".playlist-tabs").addClass("hide");
}
$("#password").attr("placeholder", "Create channel password"); $("#password").attr("placeholder", "Create channel password");
} }