diff --git a/gulpfile.js b/gulpfile.js index af847749..84b93b8e 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -5,11 +5,11 @@ var gulp = require('gulp'), gulp.task('js', function () { gulp.src(['server/VERSION.js', 'server/config/api_key.js', 'server/public/assets/js/*.js', '!server/public/assets/js/embed*', '!server/public/assets/js/token*', '!server/public/assets/js/remotecontroller.js', '!server/public/assets/js/callback.js']) - .pipe(uglify({ + /*.pipe(uglify({ mangle: true, compress: true, enclose: true - })) + }))*/ .pipe(concat('main.min.js')) .pipe(gulp.dest('server/public/assets/dist')); }); diff --git a/server/public/assets/css/style.css b/server/public/assets/css/style.css index dcd857c6..3e196d83 100755 --- a/server/public/assets/css/style.css +++ b/server/public/assets/css/style.css @@ -2308,7 +2308,6 @@ nav ul li:hover, nav ul li.active { #controls { - overflow: hidden; z-index: 99999999999; opacity:0; height:32px; diff --git a/server/public/assets/js/channel.js b/server/public/assets/js/channel.js index 3daac752..3c9b86d1 100644 --- a/server/public/assets/js/channel.js +++ b/server/public/assets/js/channel.js @@ -84,7 +84,7 @@ var Channel = { Channel.spotify_is_authenticated(spotify_authenticated); result_html = document.getElementById("temp-results-container"); - pagination_buttons_html = "
" + document.getElementsByClassName("pagination-results")[0].cloneNode(true).innerHTML + "
"; + pagination_buttons_html = "
" + document.getElementsByClassName("pagination-results")[0].cloneNode(true).innerHTML + "
"; empty_results_html = Helper.html("#empty-results-container"); not_import_html = Helper.html(".not-imported-container"); not_export_html = Helper.html(".not-exported-container"); @@ -111,9 +111,9 @@ var Channel = { document.getElementsByClassName("offline_switch_class")[0].checked = true; change_offline(true, offline); } - if(!Helper.mobilecheck() && ($("#alreadychannel").length === 0 || !Hostcontroller.old_id || $("#code-text").text().toUpperCase() == "ABBADUR")) setup_host_initialization(); + if(!Helper.mobilecheck() && (document.querySelectorAll("#alreadychannel").length === 0 || !Hostcontroller.old_id || document.getElementById("code-text").innerText.toUpperCase() == "ABBADUR")) setup_host_initialization(); - if($("#alreadychannel").length === 0 || Helper.mobilecheck()){ + if(document.querySelectorAll("#alreadychannel").length === 0 || Helper.mobilecheck()){ setup_youtube_listener(); get_list_listener(); setup_suggested_listener(); @@ -217,7 +217,6 @@ var Channel = { } Helper.addClass(".close-settings", "hide"); } else { - //$('input#chan_description').characterCounter(); if(!client) { Channel.window_width_volume_slider(); } @@ -251,7 +250,7 @@ var Channel = { color: "#808080", change: function(c) { color = c.toHexString().substring(1); // #ff0000 - $("#embed-area").val(embed_code(embed_autoplay, embed_width, embed_height, color)); + document.getElementById("embed-area").value = embed_code(embed_autoplay, embed_width, embed_height, color); }, appendTo: "#embed", containerClassName: 'polyfill-color z-depth-4', @@ -262,15 +261,15 @@ var Channel = { Helper.addClass(".sp-choose", "hide"); Helper.addClass(".sp-cancel", "btn-flat waves-effect waves-red"); Helper.removeClass(".sp-cancel", "sp-cancel"); - $(".sp-button-container").append("CHOOSE"); + document.getElementsByClassName("sp-button-container")[0].insertAdjacentHTML("beforeend", "CHOOSE"); } - $(".sp-choose-link").on("click", function(e) { - e.preventDefault(); - $(".sp-choose").trigger("click"); + addListener("click", ".sp-choose-link", function(e) { + event.preventDefault(); + document.getElementsByClassName("sp-choose")[0].click(); }); - $("#results" ).hover( function() { Helper.removeClass(".result", "hoverResults"); i = 0; }, function(){ }); + //$("#results" ).hover( function() { Helper.removeClass(".result", "hoverResults"); i = 0; }, function(){ }); document.getElementById("search").focus(); Helper.css("#embed-button", "display", "inline-block"); document.getElementById("embed-area").value = embed_code(embed_autoplay, embed_width, embed_height, color); @@ -314,7 +313,7 @@ var Channel = { var acceptable = ["bar", "controls", "duration"]; if(acceptable.indexOf(e.target.getAttribute("id")) >= 0) { - var total = full_playlist[full_playlist.length - 1].duration / $("#controls").width(); + var total = full_playlist[full_playlist.length - 1].duration / document.getElementById("controls").offsetWidth; total = total * e.clientX; if(!chromecastAvailable){ @@ -335,7 +334,7 @@ var Channel = { per = 100; else if(duration === 0) per = 0; - $("#bar").width(per+"%"); + document.getElementById("bar").style.width = per + "%" } else { castSession.sendMessage("urn:x-cast:zoff.me", {type: "seekTo", seekTo: total}); } @@ -343,14 +342,14 @@ var Channel = { }, seekToMove: function(e){ - var pos_x = e.clientX - Math.ceil($("#seekToDuration").width() / 2) - 8; + var pos_x = e.clientX - Math.ceil(document.getElementById("seekToDuration").outerWidth / 2) - 8; if(pos_x < 0) pos_x = 0; - else if(pos_x + $("#seekToDuration").width() > $("#controls").width()) { - pos_x = $("#controls").width() - $("#seekToDuration").width(); + else if(pos_x + document.getElementById("seekToDuration").outerWidth > document.getElementById("controls").outerWidth) { + pos_x = document.getElementById("controls").outerWidth - document.getElementById("seekToDuration").outerWidth; } - $("#seekToDuration").css("left", pos_x); + Helper.css("#seekToDuration", "left", pos_x); try{ - var total = full_playlist[full_playlist.length - 1].duration / $("#controls").width(); + var total = full_playlist[full_playlist.length - 1].duration / document.getElementById("controls").outerWidth; total = total * e.clientX; var _time = Helper.secondsToOther(total); var _minutes = Helper.pad(_time[0]); @@ -359,22 +358,22 @@ var Channel = { var acceptable = ["bar", "controls", "duration"]; if(acceptable.indexOf(e.target.getAttribute("id")) >= 0 && dragging) { - $("#bar").width(((100 / duration) * total) + "%"); + document.getElementById("bar").style.width(((100 / duration) * total) + "%"); } } catch(e){} }, set_title_width: function(start){ - if($(window).width() + 8 > 600){ - var add_width = $(".brand-logo").outerWidth() + if(window.innerWidth > 600){ + var add_width = document.getElementsByClassName("brand-logo")[0].offsetWidth if(start){ - add_width = $(window).width()*0.15; + add_width = window.innerWidth * 0.15; } - var test_against_width = $(window).width() - $(".control-list").width() - add_width - 33; + var test_against_width = window.innerWidth - document.getElementsByClassName("control-list")[0].offsetWidth - add_width - 33; title_width = test_against_width; - $(".title-container").width(title_width); + document.getElementsByClassName("title-container")[0].style.width = title_width + "px"; } else { - $(".title-container").width("100%"); + document.getElementsByClassName("title-container")[0].style.width = "100%"; } }, @@ -417,11 +416,10 @@ var Channel = { }, share_link_modifier: function(){ - $("#facebook-code-link").attr("href", "https://www.facebook.com/sharer/sharer.php?u=https://zoff.me/" + chan.toLowerCase()); - $("#facebook-code-link").attr("onclick", "window.open('https://www.facebook.com/sharer/sharer.php?u=https://zoff.me/" + chan.toLowerCase() + "', 'Share Playlist','width=600,height=300'); return false;"); - $("#twitter-code-link").attr("href", "https://twitter.com/intent/tweet?url=https://zoff.me/" + chan.toLowerCase() + "&text=Check%20out%20this%20playlist%20" + chan.toLowerCase() + "%20on%20Zoff!&via=zoffmusic"); - $("#twitter-code-link").attr("onclick", "window.open('https://twitter.com/intent/tweet?url=https://zoff.me/" + chan.toLowerCase() + "/&text=Check%20out%20this%20playlist%20" + chan.toLowerCase() + "%20on%20Zoff!&via=zoffmusic','Share Playlist','width=600,height=300'); return false;"); - //$("#qr-code-image-link").attr("src", "//chart.googleapis.com/chart?chs=150x150&cht=qr&chl=https://zoff.me/" + chan.toLowerCase() + "&choe=UTF-8&chld=L%7C1"); + document.getElementById("facebook-code-link").setAttribute("href", "https://www.facebook.com/sharer/sharer.php?u=https://zoff.me/" + chan.toLowerCase()); + document.getElementById("facebook-code-link").setAttribute("onclick", "window.open('https://www.facebook.com/sharer/sharer.php?u=https://zoff.me/" + chan.toLowerCase() + "', 'Share Playlist','width=600,height=300'); return false;"); + document.getElementById("twitter-code-link").setAttribute("href", "https://twitter.com/intent/tweet?url=https://zoff.me/" + chan.toLowerCase() + "&text=Check%20out%20this%20playlist%20" + chan.toLowerCase() + "%20on%20Zoff!&via=zoffmusic"); + document.getElementById("twitter-code-link").setAttribute("onclick", "window.open('https://twitter.com/intent/tweet?url=https://zoff.me/" + chan.toLowerCase() + "/&text=Check%20out%20this%20playlist%20" + chan.toLowerCase() + "%20on%20Zoff!&via=zoffmusic','Share Playlist','width=600,height=300'); return false;"); }, window_width_volume_slider: function() { @@ -436,26 +434,28 @@ var Channel = { }, listeners: function(on) { + var scrollListener = function(e) { + if(!programscroll) { + userscroll = true; + if(document.getElementById("chatchannel").scrollTop + document.getElementById("chatchannel").offsetHeight >= document.getElementById("chatchannel").scrollHeight) { + userscroll = false; + } + } + } + var scrollAllListener = function(e) { + if(!programscroll) { + userscroll = true; + if(document.getElementById("chatall").scrollTop+ document.getElementById("chatall").offsetHeight >= document.getElementById("chatall").scrollHeight) { + userscroll = false; + } + } + } if(on) { - $("#chatchannel").scroll(function(e) { - if(!programscroll) { - userscroll = true; - if($("#chatchannel").scrollTop() + $("#chatchannel").innerHeight() >= $("#chatchannel")[0].scrollHeight) { - userscroll = false; - } - } - }); - $("#chatall").scroll(function(e) { - if(!programscroll) { - userscroll = true; - if($("#chatall").scrollTop() + $("#chatall").innerHeight() >= $("#chatall")[0].scrollHeight) { - userscroll = false; - } - } - }) + document.getElementById("chatchannel").addEventListener("scroll", scrollListener); + document.getElementById("chatall").addEventListener("scroll", scrollListener); } else { - $("#chatchannel").off("scroll"); - $("#chatall").off("scroll"); + document.getElementById("chatchannel").removeEventListener("scroll", scrollListener); + document.getElementById("chatall").removeEventListener("scroll", scrollAllListener); } }, @@ -468,7 +468,7 @@ var Channel = { Admin.beginning = true; chan = url_split[3].replace("#", ""); - $("#chan").html(Helper.upperFirst(chan)); + document.getElementById("chan").innerHTML = Helper.upperFirst(chan); var add = ""; w_p = true; if(private_channel) add = Crypt.getCookie("_uI") + "_"; @@ -482,15 +482,14 @@ var Channel = { var channel_before_move = chan.toLowerCase(); clearTimeout(timed_remove_check); changing_to_frontpage = true; - //$.contextMenu( 'destroy', ".playlist-element" ); user_change_password = false; clearTimeout(width_timeout); if(fireplace_initiated){ fireplace_initiated = false; Player.fireplace.destroy(); - $("#fireplace_player").css("display", "none"); + Helper.css("#fireplace_player", "display", "none"); } - $("#channel-load").css("display", "block"); + Helper.css("#channel-load", "display", "block"); window.scrollTo(0, 0); Player.stopInterval = true; @@ -498,17 +497,16 @@ var Channel = { began = false; durationBegun = false; - $("#embed-button").css("display", "none"); + Helper.css("#embed-button", "display", "none"); if(!Helper.mobilecheck()) { Helper.tooltip('.castButton', "destroy"); Helper.tooltip("#viewers", "destroy"); - //$('.castButton-unactive').tooltip("destroy"); Helper.tooltip("#offline-mode", "destroy"); - if(M.Tooltip.getInstance($("#chan_thumbnail")) != undefined) { + if(M.Tooltip.getInstance(document.getElementById("chan_thumbnail")) != undefined) { Helper.tooltip('#chan_thumbnail', "destroy"); } Helper.tooltip('#fullscreen', "destroy"); - if(M.Tooltip.getInstance($("#admin-lock")) != undefined) { + if(M.Tooltip.getInstance(document.getElementById("admin-lock")) != undefined) { Helper.tooltip('#admin-lock', "destroy"); } Helper.tooltip(".search-btn-container", "destroy"); @@ -522,11 +520,13 @@ var Channel = { if(!Helper.mobilecheck()) { Helper.tooltip("#chan", "destroy"); } - if(M.TapTarget.getInstance($(".tap-target"))) { - $('.tap-target').tapTarget('close'); + var tap_1 = document.querySelectorAll(".tap-target") + if(tap_1.length > 0 && M.TapTarget.getInstance(tap_1[0])) { + M.TapTarget.getInstance(tap_1[0]).close(); } - if(M.TapTarget.getInstance($(".tap-target-join"))) { - $('.tap-target-join').tapTarget('close'); + var tap_2 = document.querySelectorAll(".tap-target-join") + if(tap_2.length > 0 && M.TapTarget.getInstance(tap_2[0])) { + M.TapTarget.getInstance(tap_2[0]).close(); } } clearTimeout(tap_target_timeout); @@ -574,7 +574,7 @@ var Channel = { song_title = ""; } - $("meta[name=theme-color]").attr("content", "#2D2D2D"); + document.querySelectorAll("meta[name=theme-color]")[0].setAttribute("content", "#2D2D2D"); if(!Helper.mobilecheck() && !user_auth_avoid){ Helper.removeElement("#playbar"); @@ -583,8 +583,8 @@ var Channel = { Helper.addClass("#main-row", "frontpage_modified_heights"); Helper.css("#player", "opacity", "1"); Helper.removeClass("#video-container", "no-opacity"); - $("#main-row").prepend("
"); - $("#player_bottom_overlay").append("X"); + document.getElementById("main-row").insertAdjacentHTML("afterbegin", "
"); + document.getElementById("player_bottom_overlay").insertAdjacentHTML("afterbegin", "X"); Helper.removeElement("#playlist"); } else { try{ @@ -594,25 +594,27 @@ var Channel = { document.title = "Zoff"; } - var response = $("
" + e + "
"); - - //$(".drag-target").remove(); + var response = document.createElement("div"); + response.innerHTML = e; Helper.removeElement("#sidenav-overlay"); document.getElementsByTagName("main")[0].className = "center-align container"; Helper.removeClass("#main-container", "channelpage"); document.getElementById("main-container").setAttribute("style", ""); - $("header").html($(response.find("header")).html()); - $($(response.find(".section.mega"))).insertAfter("header"); - $($(response.find(".section.mobile-search"))).insertAfter(".mega"); - if(Helper.mobilecheck() || user_auth_avoid) $("main").html($(response.find("main")).html()); - else $("main").append($(response.find("#main_section_frontpage")).wrap("
").parent().html()); + document.getElementsByTagName("header")[0].innerHTML = response.querySelectorAll("header")[0].outerHTML; + + document.getElementsByTagName("header")[0].insertAdjacentHTML("afterend", response.querySelectorAll(".section.mega")[0].outerHTML); + //document.getElementsByTagName("header")[0].insertAdjacentHTML("afterend", response.querySelectorAll(".section.mobile-search")[0].innerHTML); + if(Helper.mobilecheck() || user_auth_avoid) { + document.getElementsByTagName("main")[0].innerHTML = response.querySelectorAll("main")[0].innerHTML; + } else { + document.getElementsByTagName("main")[0].insertAdjacentHTML("beforeend", response.querySelectorAll("#main_section_frontpage")[0].outerHTML); + } Helper.removeClass(".page-footer", "padding-bottom-extra"); Helper.removeClass(".page-footer", "padding-bottom-novideo"); document.getElementById("favicon").setAttribute("href", "/assets/images/favicon-32x32.png"); - //$(".context-menu-list").remove(); Helper.log(["Socket", socket]); - if($("#alreadyfp").length == 1){ + if(document.querySelectorAll("#alreadyfp").length == 1){ Frontpage.init(); }else { fromChannel = true; @@ -621,8 +623,8 @@ var Channel = { } changing_to_frontpage = false; - if($("#alreadychannel").length === 0 && !user_auth_avoid){ - $("head").append("
No channels yet

"); + Helper.css("#preloader", "display", "none"); + document.getElementById("channel-list-container").insertAdjacentHTML("beforeend", "

No channels yet

"); } else { Frontpage.populate_channels(msg.channels, true); } @@ -31,7 +31,7 @@ var Frontpage = { }, populate_channels: function(lists, popular) { - $("#channels").empty(); + document.getElementById("channels").innerHTML = ""; var num = 0; @@ -64,7 +64,7 @@ var Frontpage = { Frontpage.add_backdrop(lists, 0); } - pre_card = $(channel_list); + pre_card = channel_list; Helper.log([ "Pre_card: ", @@ -83,37 +83,40 @@ var Frontpage = { } var song_count = lists[x].count; - - var card = pre_card.clone(); + var card = document.createElement("div"); + card.innerHTML += pre_card; + //card.innerHTML = card.children[0]; if(song_count > 4) { if(lists[x].pinned == 1) { - card.find(".pin").attr("style", "display:block;"); + card.querySelector(".pin").setAttribute("style", "display:block;"); //card.find(".card").attr("title", "Featured list"); } else { /*card.find(".pin").attr("style", "display:none;"); card.find(".card").attr("title", "");*/ - card.find(".pin").remove(); + card.querySelector(".pin").remove(); } - card.find(".chan-name").text(chan); - card.find(".chan-name").attr("title", chan); - card.find(".chan-views").text(viewers); - card.find(".chan-songs").text(song_count); - card.find(".chan-bg").attr("style", img); - card.find(".chan-link").attr("href", chan + "/"); + card.querySelector(".chan-name").innerText = chan; + card.querySelector(".chan-name").setAttribute("title", chan); + card.querySelector(".chan-views").innerText = viewers; + card.querySelector(".chan-songs").innerText = song_count; + card.querySelector(".chan-bg").setAttribute("style", img); + card.querySelector(".chan-link").setAttribute("href", chan + "/"); if(description != "" && description != undefined && !Helper.mobilecheck()) { - card.find(".card-title").text(chan); - card.find(".description_text").text(description); + card.querySelector(".card-title").innerText = chan; + card.querySelector(".description_text").innerText = description; description = ""; } else { - card.find(".card-reveal").remove(); - card.find(".card").removeClass("sticky-action") + card.querySelector(".card-reveal").remove(); + Helper.removeClass(card.querySelector(".card"), "sticky-action") } - $("#channels").append(card.html()); + document.getElementById("channels").insertAdjacentHTML("beforeend", card.children[0].innerHTML); + //console.log(card.children[0].children[0]); } else { num--; } + } num++; } @@ -125,18 +128,18 @@ var Frontpage = { for(var x in options_list) { data[options_list[x]._id] = null; } - if($(".pin").length == 1 && !Helper.mobilecheck()) { - $($(".pin").parent().parent().parent()).tooltip({ + if(document.querySelectorAll(".pin").length == 1 && !Helper.mobilecheck()) { + Helper.tooltip(document.querySelectorAll(".pin")[0].parent().parent().parent(), { delay: 5, position: "top", html: "Featured playlist" }); } - var to_autocomplete = "input.autocomplete"; + var to_autocomplete = document.querySelectorAll("input.autocomplete")[0]; //if(Helper.mobilecheck()) to_autocomplete = "input.mobile-search"; - $(to_autocomplete).autocomplete({ + M.Autocomplete.init(to_autocomplete, { data: data, limit: 5, // The max amount of results that can be shown at once. Default: Infinity. onAutocomplete: function(val) { @@ -147,7 +150,7 @@ var Frontpage = { document.getElementById("preloader").style.display = "none"; //Materialize.fadeInImage('#channels'); $("#channels").fadeIn(800); - $("#searchFrontpage").focus(); + document.getElementById("autocomplete-input").focus(); num = 0; }, @@ -308,7 +311,7 @@ var Frontpage = { to_channel: function(new_channel, popstate) { console.log(new_channel); - $("#channel-load").css("display", "block"); + Helper.css("#channel-load", "display", "block"); window.scrollTo(0, 0); frontpage = false; new_channel = new_channel.toLowerCase(); @@ -317,14 +320,14 @@ var Frontpage = { Helper.log(["removing all listeners"]); removeAllListeners(); } - $("#main-container").css("background-color", "#2d2d2d"); + Helper.css("#main-container", "background-color", "#2d2d2d"); if(!Helper.mobilecheck()) { Helper.tooltip("#frontpage-viewer-counter", "destroy"); Helper.tooltip(".generate-channel-name", "destroy"); Helper.tooltip("#offline-mode", "destroy"); Helper.tooltip("#client-mode-button", "destroy"); - if($(".pin").length == 1) { - $($(".pin").parent().parent().parent()).tooltip("destroy"); + if(document.querySelectorAll(".pin").length == 1) { + Helper.tooltip(document.querySelectorAll(".pin")[0].parent().parent().parent(), "destroy"); } } currently_showing_channels = 1; @@ -339,7 +342,8 @@ var Frontpage = { //Player.player.destroy(); socket.emit("change_channel", {channel: chan.toLowerCase()}); } - $("#frontpage_player").empty(); + var _player = document.querySelectorAll("#frontpage_player"); + if(_player.length > 0) _player[0].innerHTML = ""; if(Helper.mobilecheck()) { //Helper.log("disconnecting"); //socket.disconnect(); @@ -353,21 +357,24 @@ var Frontpage = { window.chan = new_channel; } - var response = $("
" + e + "
"); + var response = document.createElement("div"); + response.innerHTML = e; - $('select').formSelect('destroy'); + M.FormSelect.getInstance(document.querySelector("#view_channels_select")).destroy(); + //$('select').formSelect('destroy'); Helper.removeElement(".mega"); Helper.removeElement(".mobile-search"); document.getElementsByTagName("main")[0].className = "container center-align main"; Helper.addClass("#main-container", "channelpage"); - //$("header").html($($(e)[63]).html()); - $("header").html($(response.find("header")).html()); - if($("#alreadychannel").length === 0 || Helper.mobilecheck() || Player.player === undefined){ - $("main").html($(response.find("main")).html()); + + document.getElementsByTagName("header")[0].innerHTML = response.querySelectorAll("header")[0].innerHTML; + + if(document.querySelectorAll("#alreadychannel").length === 0 || Helper.mobilecheck() || Player.player === undefined){ + document.getElementsByTagName("main")[0].innerHTML = response.querySelectorAll("main")[0].innerHTML; } else { - $("#main-row").append($(response.find("#playlist").wrap("
").parent().html())); - $("#video-container").append($(response.find("#main_components").wrap("
").parent().html())); - $("#main-row").append("
"); + document.getElementById("main-row").insertAdjacentHTML("beforeend", response.querySelectorAll("#playlist")[0].outerHTML); + document.getElementById("video-container").insertAdjacentHTML("beforeend", response.querySelectorAll("#main_components")[0].outerHTML); + document.getElementById("main-row").insertAdjacentHTML("beforeend", "
"); Helper.removeClass("#player", "player_bottom"); Helper.removeClass("#main-row", "frontpage_modified_heights"); Helper.removeElement("#main_section_frontpage"); @@ -377,13 +384,13 @@ var Frontpage = { document.getElementById("search").setAttribute("placeholder", "Find song on YouTube..."); Helper.addClass(".page-footer", "padding-bottom-novideo"); from_frontpage = true; - if($("#alreadychannel").length == 1){ + if(document.querySelectorAll("#alreadychannel").length == 1){ Channel.init(); }else{ fromFront = true; Channel.init(); } - if($("#alreadyfp").length === 0) $("head").append("
"); + if(document.querySelectorAll("#alreadyfp").length === 0) document.getElementsByTagName("head")[0].insertAdjacentHTML("beforeend", "
"); } }); @@ -394,8 +401,8 @@ var Frontpage = { var date = new Date(); Frontpage.blob_list = []; if(date.getMonth() == 3 && date.getDate() == 1){ - $(".mega").css("-webkit-transform", "rotate(180deg)"); - $(".mega").css("-moz-transform", "rotate(180deg)"); + Helper.css(".mega", "-webkit-transform", "rotate(180deg)"); + Helper.css(".mega", "-moz-transform", "rotate(180deg)"); //Materialize.toast('

We suck at pranks..Agreed

', 100000); } @@ -415,7 +422,7 @@ var Frontpage = { Helper.addClass("footer", "hide"); } - channel_list = $("#channel-list-container").clone().html(); + channel_list = document.getElementById("channel-list-container").cloneNode(true).innerHTML; if(window.location.hostname != "fb.zoff.me") Frontpage.share_link_modifier(); @@ -439,7 +446,8 @@ var Frontpage = { M.Modal.init(document.getElementById("about")); M.Modal.init(document.getElementById("help")); M.Modal.init(document.getElementById("contact")); - $('select').formSelect(); + var elem = document.querySelector('select'); + var instance = M.FormSelect.init(elem); Helper.log([ "Sending frontpage_lists", @@ -492,21 +500,21 @@ var Frontpage = { var pad = 0; - $(".zicon").on("click", function(e) { + /*$(".zicon").on("click", function(e) { e.preventDefault(); pad += 10; - $(".zicon").css("padding-left", pad + "vh"); + Helper.css(".zicon", "padding-left", pad + "vh"); if(pad >= 80) window.location.href = 'http://etys.no'; - }); + });*/ if(!Helper.mobilecheck() && Frontpage.winter) { - $(".mega").prepend('
'); + document.getElementsByClassName("mega")[0].insertAdjacentHTML("afterbegin", '
'); } if(Helper.mobilecheck()){ - $('input#autocomplete-input').characterCounter(); + //$('input#autocomplete-input').characterCounter(); } window['__onGCastApiAvailable'] = function(loaded, errorInfo) { @@ -518,10 +526,10 @@ var Frontpage = { }, share_link_modifier: function() { - $("#facebook-code-link").attr("href", "https://www.facebook.com/sharer/sharer.php?u=https://zoff.me/"); - $("#facebook-code-link").attr("onclick", "window.open('https://www.facebook.com/sharer/sharer.php?u=https://zoff.me/', 'Share Zoff','width=600,height=300'); return false;"); - $("#twitter-code-link").attr("href", "https://twitter.com/intent/tweet?url=https://zoff.me/&text=Check%20out%20Zoff!&via=zoffmusic"); - $("#twitter-code-link").attr("onclick", "window.open('https://twitter.com/intent/tweet?url=https://zoff.me/&text=Check%20out%20Zoff!&via=zoffmusic','Share Playlist','width=600,height=300'); return false;"); + document.getElementById("facebook-code-link").setAttribute("href", "https://www.facebook.com/sharer/sharer.php?u=https://zoff.me/"); + document.getElementById("facebook-code-link").setAttribute("onclick", "window.open('https://www.facebook.com/sharer/sharer.php?u=https://zoff.me/', 'Share Zoff','width=600,height=300'); return false;"); + document.getElementById("twitter-code-link").setAttribute("href", "https://twitter.com/intent/tweet?url=https://zoff.me/&text=Check%20out%20Zoff!&via=zoffmusic"); + document.getElementById("twitter-code-link").setAttribute("onclick", "window.open('https://twitter.com/intent/tweet?url=https://zoff.me/&text=Check%20out%20Zoff!&via=zoffmusic','Share Playlist','width=600,height=300'); return false;"); //$("#qr-code-link").attr("href", "//chart.googleapis.com/chart?chs=500x500&cht=qr&chl=https://zoff.me/&choe=UTF-8&chld=L%7C1"); //$("#qr-code-image-link").attr("src", "//chart.googleapis.com/chart?chs=150x150&cht=qr&chl=https://zoff.me/&choe=UTF-8&chld=L%7C1"); } diff --git a/server/public/assets/js/functions.js b/server/public/assets/js/functions.js index cd1fb91a..e9d589c8 100644 --- a/server/public/assets/js/functions.js +++ b/server/public/assets/js/functions.js @@ -44,8 +44,8 @@ function hide_native(way) { $('.castButton').addClass('castButton-white-active'); } if(!Helper.mobilecheck()) { - if(M.Tooltip.getInstance($(".castButton"))) { - $('.castButton').tooltip('destroy'); + if(M.Tooltip.getInstance(document.getElementsByClassName("castButton")[0])) { + Helper.tooltip('.castButton', 'destroy'); } Helper.tooltip('.castButton', { delay: 5, @@ -90,8 +90,8 @@ function hide_native(way) { $("#player_overlay_text").toggleClass("hide"); } else if(way == 0){ if(!Helper.mobilecheck()) { - if(M.Tooltip.getInstance($(".castButton"))) { - $('.castButton').tooltip('destroy'); + if(M.Tooltip.getInstance(document.getElementsByClassName("castButton")[0])) { + Helper.tooltip('.castButton', 'destroy'); } Helper.tooltip('.castButton', { delay: 5, @@ -524,8 +524,8 @@ function change_offline(enabled, already_offline){ ga('send', 'event', "button-click", "offline", "", offline ? 1 : 0); socket.emit("offline", {status: enabled, channel: chan != undefined ? chan.toLowerCase() : ""}); if(!Helper.mobilecheck()) { - if($("#offline-mode").length == 1 && M.Tooltip.getInstance($("#offline-mode"))) { - $("#offline-mode").tooltip('destroy'); + if(document.querySelectorAll("#offline-mode").length == 1 && M.Tooltip.getInstance(document.getElementById("offline-mode"))) { + Helper.tooltip("#offline-mode", 'destroy'); } } if(enabled){ @@ -625,19 +625,20 @@ function change_offline(enabled, already_offline){ } } -function handleEvent(e, target, tried) { - if(dynamicListeners["click"] && dynamicListeners["click"]["#" + target.id]) { - dynamicListeners["click"]["#" + target.id].call(target); +function handleEvent(e, target, tried, type) { + if(dynamicListeners[type] && dynamicListeners[type]["#" + target.id]) { + dynamicListeners[type]["#" + target.id].call(target); return; } else { for(var i = 0; i < target.classList.length; i++) { - if(dynamicListeners["click"] && dynamicListeners["click"]["." + target.classList[i]]) { - dynamicListeners["click"]["." + target.classList[i]].call(target); + if(dynamicListeners[type] && dynamicListeners[type]["." + target.classList[i]]) { + dynamicListeners[type]["." + target.classList[i]].call(target); return; } } - }if(!tried) { - handleEvent(e, e.target.parentElement, true); + } + if(!tried) { + handleEvent(e, e.target.parentElement, true, type); } } @@ -842,7 +843,7 @@ function before_toast(){ } function scrollChat() { - var current = $(".chat-tab.active").attr("href"); + var current = $(".chat-tab active").attr("href"); if(current == "#channelchat") { $('#chatchannel').scrollTop($('#chatchannel')[0].scrollHeight); } else if(current == "#all_chat") { diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js index e6a064f4..f13f49d4 100755 --- a/server/public/assets/js/listeners.js +++ b/server/public/assets/js/listeners.js @@ -347,6 +347,8 @@ addListener("click", "#player_overlay", function(e) { } }); + + addListener("click", "#bitcoin-address", function(e) { var copyTextarea = document.querySelector('#bitcoin-address'); copyTextarea.select(); @@ -624,19 +626,19 @@ addListener("click", "#closePlayer", function(e){ document.addEventListener("click", function(e) { - handleEvent(e, e.target, false); + handleEvent(e, e.target, false, "click"); }, false); document.addEventListener("input", function(e) { - handleEvent(e, e.target, false); + handleEvent(e, e.target, false, "input"); }, true); document.addEventListener("change", function(e) { - handleEvent(e, e.target, false); + handleEvent(e, e.target, false, "change"); }, true); document.addEventListener("submit", function(e) { - handleEvent(e, e.target, false); + handleEvent(e, e.target, false, "submit"); }, true); addListener("click", ".prev_page", function(e) { @@ -767,8 +769,8 @@ addListener("click", "#aprilfools", function(){ addListener("change", '#view_channels_select', function(e) { var that = this; + console.log("test", that.value) if(currently_showing_channels != parseInt(that.value)) { - Frontpage.populate_channels(Frontpage.all_channels, (parseInt(that.value) == 1 ? true : false)); } currently_showing_channels = parseInt(that.value); diff --git a/server/public/assets/js/player.js b/server/public/assets/js/player.js index f46b39dd..3e1630eb 100755 --- a/server/public/assets/js/player.js +++ b/server/public/assets/js/player.js @@ -615,6 +615,7 @@ var Player = { } Player.readyLooks(); Playercontrols.initYoutubeControls(Player.player); + Player.player.setVolume(Crypt.get_volume()); Playercontrols.initSlider(); Player.player.setVolume(Crypt.get_volume()); }catch(e){ diff --git a/server/public/partials/channel/panel.handlebars b/server/public/partials/channel/panel.handlebars index f952c050..9005623a 100755 --- a/server/public/partials/channel/panel.handlebars +++ b/server/public/partials/channel/panel.handlebars @@ -1,13 +1,13 @@ -
  • + -