From a1e1b30df73b8138e77961f00c40797478e68763 Mon Sep 17 00:00:00 2001
From: Terry Truong <terry06890@gmail.com>
Date: Fri, 25 Mar 2022 17:14:17 +1100
Subject: Simplify transition code

---
 src/components/TileInfoModal.vue | 31 +++++--------------------------
 1 file changed, 5 insertions(+), 26 deletions(-)

(limited to 'src/components/TileInfoModal.vue')

diff --git a/src/components/TileInfoModal.vue b/src/components/TileInfoModal.vue
index 367546d..fedd933 100644
--- a/src/components/TileInfoModal.vue
+++ b/src/components/TileInfoModal.vue
@@ -4,34 +4,13 @@ import {TolNode} from '../lib';
 
 export default defineComponent({
 	props: {
-		tolNode: {type: Object as PropType<TolNode | null>}, // The node to display, or null to hide
+		tolNode: {type: Object as PropType<TolNode>},
 		options: {type: Object, required: true},
 	},
-	data(){
-		return {
-			lastNode: null as TolNode | null, // Caches tolNode to prevent content-change during fade-out
-		};
-	},
-	watch: {
-		tolNode(newNode){
-			if (newNode != null){
-				this.lastNode = newNode;
-			}
-		},
-	},
 	computed: {
-		transitionStyles(): Record<string,string> {
-			return {
-				visibility: this.tolNode != null ? 'visible' : 'hidden',
-				opacity: this.tolNode != null ? '1' : '0',
-				transition: 'visibility, opacity',
-				transitionDuration: this.options.transitionDuration + 'ms',
-			};
-		},
 		imgStyles(): Record<string,string> {
 			return {
-				backgroundImage: this.lastNode == null ? 'none' :
-					'url(\'/img/' + this.lastNode.name.replaceAll('\'', '\\\'') + '.png\')',
+				backgroundImage: 'url(\'/img/' + this.tolNode.name.replaceAll('\'', '\\\'') + '.png\')',
 				width: this.options.infoModalImgSz + 'px',
 				height: this.options.infoModalImgSz + 'px',
 				backgroundSize: 'cover',
@@ -46,18 +25,18 @@ export default defineComponent({
 			}
 		},
 	},
-	emits: ['info-modal-close']
+	emits: ['info-modal-close'],
 });
 </script>
 
 <template>
-<div :style="transitionStyles" class="fixed left-0 top-0 w-full h-full bg-black/40" @click="closeClicked">
+<div class="fixed left-0 top-0 w-full h-full bg-black/40" @click="closeClicked">
 	<div class="absolute left-1/2 -translate-x-1/2 w-4/5 top-1/2 -translate-y-1/2 p-4
 		bg-stone-50 rounded-md shadow shadow-black">
 		<div class="absolute top-2 right-2 w-[24px] h-[24px] [font-size:24px] [line-height:24px] text-center
 				font-bold hover:cursor-pointer"
 			@click="closeClicked" ref="closeIcon">&times;</div>
-		<h1 class="text-center text-xl font-bold mb-2">{{lastNode != null ? lastNode.name : 'NULL'}}</h1>
+		<h1 class="text-center text-xl font-bold mb-2">{{tolNode.name}}</h1>
 		<hr class="mb-4 border-stone-400"/>
 		<div :style="imgStyles" class="float-left mr-4" alt="an image"></div>
 		<div>
-- 
cgit v1.2.3