Fixed some accordion issues, and removed sidenavoverlay on change

This commit is contained in:
Kasper Rynning-Tønnesen
2016-01-23 16:08:32 +01:00
parent c39ff619bc
commit 4831b7cf7f
4 changed files with 12 additions and 12 deletions

File diff suppressed because one or more lines are too long

View File

@@ -59,9 +59,7 @@ var Crypt = {
var CookieDate = new Date; var CookieDate = new Date;
CookieDate.setFullYear(CookieDate.getFullYear( ) +1); CookieDate.setFullYear(CookieDate.getFullYear( ) +1);
if(cookie != "_opt") add = chan.toLowerCase()+";"; document.cookie = cookie+"="+encrypted.toString()+";expires="+CookieDate.toGMTString()+";path=/;";
else add = ";"
document.cookie = cookie+"="+encrypted.toString()+";expires="+CookieDate.toGMTString()+";path=/"+add
}, },
encrypt_string: function(string){ encrypt_string: function(string){
@@ -104,11 +102,7 @@ var Crypt = {
var CookieDate = new Date; var CookieDate = new Date;
CookieDate.setFullYear(CookieDate.getFullYear( ) +1); CookieDate.setFullYear(CookieDate.getFullYear( ) +1);
//if(name != "_opt") add = chan.toLowerCase(); document.cookie = name+"="+encrypted.toString()+";expires="+CookieDate.toGMTString()+";path=/;";
//else
add = ";"
document.cookie = name+"="+encrypted.toString()+";expires="+CookieDate.toGMTString()+";path=/"+add;
//document.cookie = name+"="+encrypted.toString()+";expires="+CookieDate.toGMTString()+";path=/;" //document.cookie = name+"="+encrypted.toString()+";expires="+CookieDate.toGMTString()+";path=/;"
//document.cookie = na"="+encrypted.toString()+";expires="+CookieDate.toGMTString()+";path=/;" //document.cookie = na"="+encrypted.toString()+";expires="+CookieDate.toGMTString()+";path=/;"
return Crypt.getCookie(name); return Crypt.getCookie(name);

View File

@@ -79,7 +79,10 @@ $(document).ready(function()
$("#settings").sideNav({ $("#settings").sideNav({
menuWidth: 300, // Default is 240 menuWidth: 300, // Default is 240
edge: 'right', // Choose the horizontal origin edge: 'right', // Choose the horizontal origin
closeOnClick: false // Closes side-nav on <a> clicks, useful for Angular/Meteor closeOnClick: true // Closes side-nav on <a> clicks, useful for Angular/Meteor
});
$('.collapsible').collapsible({
accordion : true // A setting that changes the collapsible behavior to expandable instead of the default accordion style
}); });
//awdwad //awdwad
$(".video-container").resizable({ $(".video-container").resizable({
@@ -436,6 +439,8 @@ function onepage_load(){
document.title = "Zöff"; document.title = "Zöff";
$(".drag-target").remove();
$(".sidenav-overlay").remove();
$("main").attr("class", "center-align container"); $("main").attr("class", "center-align container");
$("body").attr("id", ""); $("body").attr("id", "");
$("body").attr("style", ""); $("body").attr("style", "");

View File

@@ -2,7 +2,7 @@ var Playercontrols = {
stopInterval: false, stopInterval: false,
initYoutubeControls: function(player) initYoutubeControls: function()
{ {
if(window.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){ if(window.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){
$("#controls").appendTo("#playbar"); $("#controls").appendTo("#playbar");
@@ -158,6 +158,7 @@ var Playercontrols = {
durationSetter: function() durationSetter: function()
{ {
duration = Youtube.ytplayer.getDuration(); duration = Youtube.ytplayer.getDuration();
console.log(duration)
if(duration != undefined){ if(duration != undefined){
dMinutes = Math.floor(duration / 60); dMinutes = Math.floor(duration / 60);
dSeconds = duration - dMinutes * 60; dSeconds = duration - dMinutes * 60;