incremental-social/The-Modding-Tree
incremental-social/The-Modding-Tree
Template
1
0
Fork 0
mirror of https://github.com/Acamaeda/The-Modding-Tree.git synced 2024-11-21 16:13:55 +00:00
Code Issues Releases Activity Actions

Merge pull request #31 from thepaperpilot/fix-empty-tooltips

Browse source 
Fixed tooltip showing 'false' when tmp[layer].tooltip === ''
This commit is contained in:
Harley White 2021-04-29 23:23:36 -04:00 committed by GitHub
commit a80184ee0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
js/technical/systemComponents.js
View file

@ -14,7 +14,7 @@ var systemComponents = {
'tree-node': { 'tree-node': {
props: ['layer', 'abb', 'size'], props: ['layer', 'abb', 'size'],
template: ` template: `
<button v-if="nodeShown(layer)" <button v-if="nodeShown(layer)"
v-bind:id="layer" v-bind:id="layer"
v-on:click="function() { v-on:click="function() {
if (shiftDown) player[layer].forceTooltip = !player[layer].forceTooltip if (shiftDown) player[layer].forceTooltip = !player[layer].forceTooltip
@ -40,7 +40,8 @@ var systemComponents = {
v-bind:style="tmp[layer].computedNodeStyle"> v-bind:style="tmp[layer].computedNodeStyle">
<span v-html="(abb !== '' && tmp[layer].image === undefined) ? abb : '&nbsp;'"></span> <span v-html="(abb !== '' && tmp[layer].image === undefined) ? abb : '&nbsp;'"></span>
<tooltip <tooltip
:text="(tmp[layer].tooltip == '') ? false : (tmp[layer].isLayer) ? ( v-if="tmp[layer].tooltip != ''"
:text="(tmp[layer].isLayer) ? (
player[layer].unlocked ? (tmp[layer].tooltip ? tmp[layer].tooltip : formatWhole(player[layer].points) + ' ' + tmp[layer].resource) player[layer].unlocked ? (tmp[layer].tooltip ? tmp[layer].tooltip : formatWhole(player[layer].points) + ' ' + tmp[layer].resource)
: (tmp[layer].tooltipLocked ? tmp[layer].tooltipLocked : 'Reach ' + formatWhole(tmp[layer].requires) + ' ' + tmp[layer].baseResource + ' to unlock (You have ' + formatWhole(tmp[layer].baseAmount) + ' ' + tmp[layer].baseResource + ')') : (tmp[layer].tooltipLocked ? tmp[layer].tooltipLocked : 'Reach ' + formatWhole(tmp[layer].requires) + ' ' + tmp[layer].baseResource + ' to unlock (You have ' + formatWhole(tmp[layer].baseAmount) + ' ' + tmp[layer].baseResource + ')')
) )