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

Removed tooltips from mobile

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-09-27 11:23:18 +02:00
parent b246c2029f
commit 70f9eda634
4 changed files with 122 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/public/assets/dist/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

20
server/public/assets/js/admin.js
View File

@@ -34,7 +34,9 @@ var Admin = {
Admin.display_logged_out(); Admin.display_logged_out();
$("#thumbnail_form").css("display", "none"); $("#thumbnail_form").css("display", "none");
$("#description_form").css("display", "none"); $("#description_form").css("display", "none");
$('#chan_thumbnail').tooltip("remove"); if(!Helper.mobilecheck()) {
$('#chan_thumbnail').tooltip("remove");
}
w_p = true; w_p = true;
break; break;
case "deleted_songs": case "deleted_songs":
@@ -61,7 +63,9 @@ var Admin = {
Admin.display_logged_out(); Admin.display_logged_out();
$("#thumbnail_form").css("display", "none"); $("#thumbnail_form").css("display", "none");
$("#description_form").css("display", "none"); $("#description_form").css("display", "none");
$('#chan_thumbnail').tooltip("remove"); if(!Helper.mobilecheck()) {
$('#chan_thumbnail').tooltip("remove");
}
w_p = true; w_p = true;
if(!$("#playlist_loader").hasClass("hide")) { if(!$("#playlist_loader").hasClass("hide")) {
$("#playlist_loader").addClass("hide"); $("#playlist_loader").addClass("hide");
@@ -86,11 +90,13 @@ var Admin = {
msg="Correct password. You now have access to the sacred realm of The Admin."; msg="Correct password. You now have access to the sacred realm of The Admin.";
$("#thumbnail_form").css("display", "inline-block"); $("#thumbnail_form").css("display", "inline-block");
$("#description_form").css("display", "inline-block"); $("#description_form").css("display", "inline-block");
$('#chan_thumbnail').tooltip({ if(!Helper.mobilecheck()) {
delay: 5, $('#chan_thumbnail').tooltip({
position: "left", delay: 5,
tooltip: "imgur link" position: "left",
}); tooltip: "imgur link"
});
}
break; break;
case "changedpass": case "changedpass":
msg="Your password has been changed!"; msg="Your password has been changed!";

24
server/public/assets/js/frontpage.js
View File

@@ -288,8 +288,10 @@ var Frontpage = {
socket.removeAllListeners(); socket.removeAllListeners();
} }
$("#main-container").css("background-color", "#2d2d2d"); $("#main-container").css("background-color", "#2d2d2d");
$("#frontpage-viewer-counter").tooltip("remove"); if(!Helper.mobilecheck()) {
$("#offline-mode").tooltip("remove"); $("#frontpage-viewer-counter").tooltip("remove");
$("#offline-mode").tooltip("remove");
}
currently_showing_channels = 1; currently_showing_channels = 1;
clearTimeout(retry_frontpage); clearTimeout(retry_frontpage);
$.ajax({ $.ajax({
@@ -414,17 +416,21 @@ function initfp() {
if(Crypt.get_offline()){ if(Crypt.get_offline()){
change_offline(true, offline); change_offline(true, offline);
} else { } else {
$("#offline-mode").tooltip({ if(!Helper.mobilecheck()) {
$("#offline-mode").tooltip({
delay: 5,
position: "bottom",
tooltip: "Enable local mode"
});
}
}
if(!Helper.mobilecheck()) {
$("#frontpage-viewer-counter").tooltip({
delay: 5, delay: 5,
position: "bottom", position: "bottom",
tooltip: "Enable local mode" tooltip: "Total Viewers"
}); });
} }
$("#frontpage-viewer-counter").tooltip({
delay: 5,
position: "bottom",
tooltip: "Total Viewers"
});
Frontpage.get_frontpage_lists(); Frontpage.get_frontpage_lists();
//socket.emit('frontpage_lists', {version: parseInt(localStorage.getItem("VERSION"))}); //socket.emit('frontpage_lists', {version: parseInt(localStorage.getItem("VERSION"))});
//socket.emit('get_userlists', Crypt.getCookie('_uI')); //socket.emit('get_userlists', Crypt.getCookie('_uI'));

170
server/public/assets/js/listeners.js
View File

@@ -278,41 +278,43 @@ function init(){
if(private_channel) add = Crypt.getCookie("_uI") + "_"; if(private_channel) add = Crypt.getCookie("_uI") + "_";
socket.emit("list", {version: parseInt(localStorage.getItem("VERSION")), channel: add + chan.toLowerCase(), pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))}); socket.emit("list", {version: parseInt(localStorage.getItem("VERSION")), channel: add + chan.toLowerCase(), pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
} }
$("#viewers").tooltip({ if(!Helper.mobilecheck()) {
delay: 5, $("#viewers").tooltip({
position: "top", delay: 5,
tooltip: "Viewers" position: "top",
}); tooltip: "Viewers"
});
$("#fullscreen").tooltip({ $("#fullscreen").tooltip({
delay: 5, delay: 5,
position: "top", position: "top",
tooltip: "Fullscreen" tooltip: "Fullscreen"
}); });
$("#search-btn").tooltip({ $("#search-btn").tooltip({
delay: 5, delay: 5,
position: "bottom", position: "bottom",
tooltip: "Search" tooltip: "Search"
}); });
$("#skip").tooltip({ $("#skip").tooltip({
delay: 5, delay: 5,
position: "bottom", position: "bottom",
tooltip: "Skip", tooltip: "Skip",
}); });
$("#shuffle").tooltip({ $("#shuffle").tooltip({
delay: 5, delay: 5,
position: "bottom", position: "bottom",
tooltip: "Shuffle", tooltip: "Shuffle",
}); });
$("#settings").tooltip({ $("#settings").tooltip({
delay: 5, delay: 5,
position: "bottom", position: "bottom",
tooltip: "Settings", tooltip: "Settings",
}); });
}
window.onYouTubeIframeAPIReady = Player.onYouTubeIframeAPIReady; window.onYouTubeIframeAPIReady = Player.onYouTubeIframeAPIReady;
if(Player.player === "" || Player.player === undefined || Helper.mobilecheck()) Player.loadPlayer(); if(Player.player === "" || Player.player === undefined || Helper.mobilecheck()) Player.loadPlayer();
@@ -335,12 +337,13 @@ function init(){
$(".search_input").focus(); $(".search_input").focus();
Helper.sample(); Helper.sample();
if(!Helper.mobilecheck()) {
$('.castButton').tooltip({ $('.castButton').tooltip({
delay: 5, delay: 5,
position: "top", position: "top",
tooltip: "Cast Zoff to TV" tooltip: "Cast Zoff to TV"
}); });
}
$("#results" ).hover( function() { $("div.result").removeClass("hoverResults"); i = 0; }, function(){ }); $("#results" ).hover( function() { $("div.result").removeClass("hoverResults"); i = 0; }, function(){ });
$("#search").focus(); $("#search").focus();
@@ -530,17 +533,18 @@ initializeCastApi = function() {
}; };
function hide_native(way) { function hide_native(way) {
if(way == 1){ if(way == 1){
$('.castButton').tooltip('remove');
if(!$('.castButton').hasClass('castButton-white-active')) { if(!$('.castButton').hasClass('castButton-white-active')) {
$('.castButton').addClass('castButton-white-active'); $('.castButton').addClass('castButton-white-active');
} }
$('.castButton').tooltip({ if(!Helper.mobilecheck()) {
delay: 5, $('.castButton').tooltip('remove');
position: "top", $('.castButton').tooltip({
tooltip: "Stop casting" delay: 5,
}); position: "top",
tooltip: "Stop casting"
});
}
$("#duration").toggleClass("hide"); $("#duration").toggleClass("hide");
$("#fullscreen").toggleClass("hide"); $("#fullscreen").toggleClass("hide");
try{ try{
@@ -571,13 +575,15 @@ function hide_native(way) {
$("#player_overlay_text").toggleClass("hide"); $("#player_overlay_text").toggleClass("hide");
} else if(way == 0){ } else if(way == 0){
$('.castButton').tooltip('remove'); if(!Helper.mobilecheck()) {
$('.castButton').tooltip('remove');
$('.castButton').tooltip({
delay: 5,
position: "top",
tooltip: "Cast Zoff to TV"
});
}
$('.castButton').removeClass('castButton-white-active'); $('.castButton').removeClass('castButton-white-active');
$('.castButton').tooltip({
delay: 5,
position: "top",
tooltip: "Cast Zoff to TV"
});
$("#duration").toggleClass("hide"); $("#duration").toggleClass("hide");
$("#fullscreen").toggleClass("hide"); $("#fullscreen").toggleClass("hide");
@@ -760,7 +766,9 @@ function change_offline(enabled, already_offline){
Crypt.set_offline(enabled); Crypt.set_offline(enabled);
offline = enabled; offline = enabled;
socket.emit("offline", {status: enabled, channel: chan != undefined ? chan.toLowerCase() : ""}); socket.emit("offline", {status: enabled, channel: chan != undefined ? chan.toLowerCase() : ""});
$("#offline-mode").tooltip('remove'); if(!Helper.mobilecheck()) {
$("#offline-mode").tooltip('remove');
}
if(enabled){ if(enabled){
if(list_html){ if(list_html){
list_html = $("<div>" + list_html + "</div>"); list_html = $("<div>" + list_html + "</div>");
@@ -771,11 +779,13 @@ function change_offline(enabled, already_offline){
$("#viewers").addClass("hide"); $("#viewers").addClass("hide");
$("#offline-mode").removeClass("waves-cyan"); $("#offline-mode").removeClass("waves-cyan");
$("#offline-mode").addClass("cyan"); $("#offline-mode").addClass("cyan");
$("#offline-mode").tooltip({ if(!Helper.mobilecheck()) {
delay: 5, $("#offline-mode").tooltip({
position: "bottom", delay: 5,
tooltip: "Disable local mode" position: "bottom",
}); tooltip: "Disable local mode"
});
}
if(window.location.pathname != "/"){ if(window.location.pathname != "/"){
$("#controls").on("mouseenter", function(e){ $("#controls").on("mouseenter", function(e){
@@ -827,11 +837,13 @@ function change_offline(enabled, already_offline){
$("#viewers").removeClass("hide"); $("#viewers").removeClass("hide");
$("#offline-mode").addClass("waves-cyan"); $("#offline-mode").addClass("waves-cyan");
$("#offline-mode").removeClass("cyan"); $("#offline-mode").removeClass("cyan");
$("#offline-mode").tooltip({ if(!Helper.mobilecheck()) {
delay: 5, $("#offline-mode").tooltip({
position: "bottom", delay: 5,
tooltip: "Enable local mode" position: "bottom",
}); tooltip: "Enable local mode"
});
}
$("#controls").off("mouseleave"); $("#controls").off("mouseleave");
$("#controls").off("mouseenter"); $("#controls").off("mouseenter");
@@ -1153,12 +1165,14 @@ $(document).on("click", ".close-user-password", function() {
if(user_auth_started) { if(user_auth_started) {
Player.stopInterval = true; Player.stopInterval = true;
user_auth_avoid = true; user_auth_avoid = true;
$('.castButton').tooltip("remove"); if(!Helper.mobilecheck()) {
$("#viewers").tooltip("remove"); $('.castButton').tooltip("remove");
//$('.castButton-unactive').tooltip("remove"); $("#viewers").tooltip("remove");
$("#offline-mode").tooltip("remove"); //$('.castButton-unactive').tooltip("remove");
$('#chan_thumbnail').tooltip("remove"); $("#offline-mode").tooltip("remove");
$('#admin-lock').tooltip("remove"); $('#chan_thumbnail').tooltip("remove");
$('#admin-lock').tooltip("remove");
}
window.history.pushState("to the frontpage!", "Title", "/"); window.history.pushState("to the frontpage!", "Title", "/");
onepage_load(); onepage_load();
} else { } else {
@@ -1827,17 +1841,19 @@ function onepage_load(){
durationBegun = false; durationBegun = false;
$("#embed-button").css("display", "none"); $("#embed-button").css("display", "none");
$('.castButton').tooltip("remove"); if(!Helper.mobilecheck()) {
$("#viewers").tooltip("remove"); $('.castButton').tooltip("remove");
//$('.castButton-unactive').tooltip("remove"); $("#viewers").tooltip("remove");
$("#offline-mode").tooltip("remove"); //$('.castButton-unactive').tooltip("remove");
$('#chan_thumbnail').tooltip("remove"); $("#offline-mode").tooltip("remove");
$('#fullscreen').tooltip("remove"); $('#chan_thumbnail').tooltip("remove");
$('#admin-lock').tooltip("remove"); $('#fullscreen').tooltip("remove");
$("#search-btn").tooltip("remove"); $('#admin-lock').tooltip("remove");
$("#skip").tooltip("remove"); $("#search-btn").tooltip("remove");
$("#shuffle").tooltip("remove"); $("#skip").tooltip("remove");
$("#settings").tooltip("remove"); $("#shuffle").tooltip("remove");
$("#settings").tooltip("remove");
}
$("#seekToDuration").remove(); $("#seekToDuration").remove();
$('.tap-target').tapTarget('close'); $('.tap-target').tapTarget('close');
clearTimeout(tap_target_timeout); clearTimeout(tap_target_timeout);