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 = "
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 = $("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 @@ -