diff --git a/js/atree.js b/js/atree.js index 6da9731..2bf49dc 100644 --- a/js/atree.js +++ b/js/atree.js @@ -1033,45 +1033,92 @@ function render_AT(UI_elem, list_elem, tree) { node_wrap.elem = node_elem; node_wrap.all_connectors_ref = atree_connectors_map; - hitbox.addEventListener('click', function(e) { - if (e.target !== this && e.target!== this.children[0]) {return;} - atree_set_state(node_wrap, !node_wrap.active); - atree_state_node.mark_dirty().update(); - }); + // add listeners + // listeners differ between mobile and desktop since hovering is a bit fucky on mobile + if (!isMobile) { // desktop + hitbox.addEventListener('click', function(e) { + atree_set_state(node_wrap, !node_wrap.active); + atree_state_node.mark_dirty().update(); + }); - // add tooltip - hitbox.addEventListener('mouseover', function(e) { - if (e.target !== this) { - return; - } - if (node_wrap.tooltip_elem) { - node_wrap.tooltip_elem.remove(); - delete node_wrap.tooltip_elem; - } - node_wrap.tooltip_elem = generateTooltip(UI_elem, node_elem, ability, atree_map); - }); + // add tooltip + hitbox.addEventListener('mouseover', function(e) { + if (node_wrap.tooltip_elem) { + node_wrap.tooltip_elem.remove(); + delete node_wrap.tooltip_elem; + } - hitbox.addEventListener('mouseout', function(e) { - if (e.target !== this) { - return; - } - if (node_wrap.tooltip_elem) { - node_wrap.tooltip_elem.remove(); - delete node_wrap.tooltip_elem; - } - }); + node_wrap.tooltip_elem = make_elem("div", ["rounded-bottom", "dark-4", "border", "mx-2", "my-4", "dark-shadow", "text-start"], { + style: { + position: "absolute", + zIndex: "100", + top: (node_elem.getBoundingClientRect().top + window.pageYOffset + 50) + "px", + left: UI_elem.getBoundingClientRect().left + "px", + width: (UI_elem.getBoundingClientRect().width * 0.95) + "px" + } + }); + generateTooltip(node_wrap.tooltip_elem, node_elem, ability, atree_map); + UI_elem.appendChild(node_wrap.tooltip_elem); + }); + + hitbox.addEventListener('mouseout', function(e) { + if (node_wrap.tooltip_elem) { + node_wrap.tooltip_elem.remove(); + delete node_wrap.tooltip_elem; + } + }); + } else { // mobile + // tap to toggle + // long press to make a popup with the tooltip and a button to turn off/on + let touchTimer = null; + let didLongPress = false; + + hitbox.addEventListener("touchstart", function(e) { + clearTimeout(touchTimer); + touchTimer = setTimeout(function() { + let popup = make_elem("div", [], {style: "position: fixed; z-index: 10000; top: 0; left: 0; width: 100vw; height: 100vh; background-color: rgba(0, 0, 0, 0.6); padding-top: 10vh; padding-left: 2.5vw; user-select: none;"}); + popup.addEventListener("click", function(e) { + // close popup if the background is clicked + if (e.target !== this) {return;} // e.target is the lowest element that was the target of the event + popup.remove(); + }); + + let tooltip = make_elem("div", ["rounded-bottom", "dark-4", "border", "dark-shadow", "text-start"], {"style": "width: 95vw; max-height: 80vh; overflow-y: scroll;"}); + generateTooltip(tooltip, node_elem, ability, atree_map); + popup.appendChild(tooltip); + + let toggleButton = make_elem("button", ["scaled-font", "disable-select"], {innerHTML: (node_wrap.active ? "Unselect Ability" : "Select Ability"), style: "width: 95vw; height: 8vh; margin-top: 2vh; text-align: center;"}); + toggleButton.addEventListener("click", function(e) { + atree_set_state(node_wrap, !node_wrap.active); + atree_state_node.mark_dirty().update(); + popup.remove(); + }); + popup.appendChild(toggleButton); + + document.body.appendChild(popup); + + didLongPress = true; + touchTimer = null; + }, 500); + }); + hitbox.addEventListener("touchend", function(e) { + if (!didLongPress) { + clearTimeout(touchTimer); + touchTimer = null; + atree_set_state(node_wrap, !node_wrap.active); + atree_state_node.mark_dirty().update(); + } else { + didLongPress = false; + } + }); + } }; atree_render_connection(atree_connectors_map); return atree_map; }; -function generateTooltip(UI_elem, node_elem, ability, atree_map) { - let container = make_elem("div", ["rounded-bottom", "dark-4", "border", "mx-2", "my-4", "dark-shadow", "text-start"], {"style": "position: absolute; z-index: 100;"}); - container.style.top = (node_elem.getBoundingClientRect().top + window.pageYOffset + 50) + "px"; - container.style.left = UI_elem.getBoundingClientRect().left + "px"; - container.style.width = UI_elem.getBoundingClientRect().width * 0.95 + "px"; - +function generateTooltip(container, node_elem, ability, atree_map) { // title let title = make_elem("b", ["scaled-font", "mx-1"], {}); title.innerHTML = ability.display_name; @@ -1101,7 +1148,7 @@ function generateTooltip(UI_elem, node_elem, ability, atree_map) { container.innerHTML += "

"; // description - let description = make_elem("p", ["scaled-font-sm", "my-0", "mx-1", "text-wrap", "mc-gray"], {}); + let description = make_elem("p", ["scaled-font", "my-0", "mx-1", "text-wrap", "mc-gray"], {}); let numberRegex = /[+-]?\d+(\.\d+)?[%+s]?/g; // +/- (optional), 1 or more digits, period followed by 1 or more digits (optional), %/+/s (optional) description.innerHTML = ability.desc.replaceAll(numberRegex, (m) => { return "" + m + "" }); container.appendChild(description); @@ -1110,7 +1157,7 @@ function generateTooltip(UI_elem, node_elem, ability, atree_map) { // archetype if ("archetype" in ability && ability.archetype !== "") { - let archetype = make_elem("p", ["scaled-font-sm", "my-0", "mx-1"], {}); + let archetype = make_elem("p", ["scaled-font", "my-0", "mx-1"], {}); archetype.innerHTML = ability.archetype + " Archetype"; switch(ability.archetype) { case "Riftwalker": @@ -1172,7 +1219,7 @@ function generateTooltip(UI_elem, node_elem, ability, atree_map) { let reqNo = "" // red x // cost - let cost = make_elem("p", ["scaled-font-sm", "my-0", "mx-1"], {}); + let cost = make_elem("p", ["scaled-font", "my-0", "mx-1"], {}); if (apUsed + ability.cost > maxAP) { cost.innerHTML = reqNo; } else { @@ -1183,7 +1230,7 @@ function generateTooltip(UI_elem, node_elem, ability, atree_map) { // archetype req if (ability.archetype_req > 0 && ability.archetype != null) { - let archReq = make_elem("p", ["scaled-font-sm", "my-0", "mx-1"], {}); + let archReq = make_elem("p", ["scaled-font", "my-0", "mx-1"], {}); if (archChosen >= ability.archetype_req) { archReq.innerHTML = reqYes; } else { @@ -1195,7 +1242,7 @@ function generateTooltip(UI_elem, node_elem, ability, atree_map) { // dependencies for (let i = 0; i < ability.dependencies.length; i++) { - let dependency = make_elem("p", ["scaled-font-sm", "my-0", "mx-1"], {}); + let dependency = make_elem("p", ["scaled-font", "my-0", "mx-1"], {}); if (satisfiedDependencies.includes(ability.dependencies[i])) { dependency.innerHTML = reqYes; } else { @@ -1207,13 +1254,10 @@ function generateTooltip(UI_elem, node_elem, ability, atree_map) { // blockers for (let i = 0; i < blockedBy.length; i++) { - let blocker = make_elem("p", ["scaled-font-sm", "my-0", "mx-1"], {}); + let blocker = make_elem("p", ["scaled-font", "my-0", "mx-1"], {}); blocker.innerHTML = reqNo + " Blocked By: " + blockedBy[i]; container.appendChild(blocker); } - - UI_elem.appendChild(container); - return container; } // resolve connector conflict, when they occupy the same cell. diff --git a/js/utils.js b/js/utils.js index c8b751c..a73f37f 100644 --- a/js/utils.js +++ b/js/utils.js @@ -1,6 +1,14 @@ let getUrl = window.location; const url_base = getUrl.protocol + "//" + getUrl.host + "/" + getUrl.pathname.split('/')[1]; +// huge regex :doom: +// replace with navigator.userAgentData.mobile once it has wider support +const isMobile = function() { + let check = false; + (function(a){if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4))) check = true;})(navigator.userAgent||navigator.vendor||window.opera); + return check; +}(); // runs immediately, so mobileCheck is a boolean not a function + const zip2 = (a, b) => a.map((k, i) => [k, b[i]]); const zip3 = (a, b, c) => a.map((k, i) => [k, b[i], c[i]]);