From 60f5588e7d07d8aef7ed732873d491386f3b885e Mon Sep 17 00:00:00 2001
From: Thaum Rystra <stefanzermatten@gmail.com>
Date: Sun, 17 May 2020 18:13:06 +0200
Subject: [PATCH] Prevented description viewers from keeping zombie text after
 description is deleted

---
 .../ui/properties/viewers/ActionViewer.vue    |  5 ++-
 .../ui/properties/viewers/AttributeViewer.vue |  5 ++-
 .../ui/properties/viewers/BuffViewer.vue      |  5 ++-
 .../ui/properties/viewers/ContainerViewer.vue | 35 +++++++++++-----
 .../properties/viewers/ExperienceViewer.vue   | 40 ++++++++++---------
 .../ui/properties/viewers/FeatureViewer.vue   |  5 ++-
 .../ui/properties/viewers/ItemViewer.vue      | 29 ++++++++++----
 .../ui/properties/viewers/NoteViewer.vue      | 11 +++--
 .../ui/properties/viewers/SkillViewer.vue     |  5 ++-
 .../ui/properties/viewers/SpellListViewer.vue | 14 +++++--
 .../ui/properties/viewers/SpellViewer.vue     | 29 ++++++++++----
 11 files changed, 128 insertions(+), 55 deletions(-)

diff --git a/app/imports/ui/properties/viewers/ActionViewer.vue b/app/imports/ui/properties/viewers/ActionViewer.vue
index 38de992d..898f026f 100644
--- a/app/imports/ui/properties/viewers/ActionViewer.vue
+++ b/app/imports/ui/properties/viewers/ActionViewer.vue
@@ -25,7 +25,10 @@
       name="Reset"
       :value="reset"
     />
-    <property-description :value="model.description" />
+    <property-description
+      v-if="model.description"
+      :value="model.description"
+    />
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/viewers/AttributeViewer.vue b/app/imports/ui/properties/viewers/AttributeViewer.vue
index 3baeca2c..cd0c93f3 100644
--- a/app/imports/ui/properties/viewers/AttributeViewer.vue
+++ b/app/imports/ui/properties/viewers/AttributeViewer.vue
@@ -38,7 +38,10 @@
       name="Reset"
       :value="reset"
     />
-    <property-description :value="model.description" />
+    <property-description
+      v-if="model.description"
+      :value="model.description"
+    />
 
     <effect-viewer
       v-if="computationContext.creature && model.baseValueCalculation"
diff --git a/app/imports/ui/properties/viewers/BuffViewer.vue b/app/imports/ui/properties/viewers/BuffViewer.vue
index ed9c0386..cea4998b 100644
--- a/app/imports/ui/properties/viewers/BuffViewer.vue
+++ b/app/imports/ui/properties/viewers/BuffViewer.vue
@@ -5,7 +5,10 @@
       name="Duration"
       :value="model.duration"
     />
-    <property-description :value="model.description" />
+    <property-description
+      v-if="model.description"
+      :value="model.description"
+    />
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/viewers/ContainerViewer.vue b/app/imports/ui/properties/viewers/ContainerViewer.vue
index 940b39a2..bbd7dc5e 100644
--- a/app/imports/ui/properties/viewers/ContainerViewer.vue
+++ b/app/imports/ui/properties/viewers/ContainerViewer.vue
@@ -1,15 +1,30 @@
 <template lang="html">
   <div class="container-viewer">
-		<property-name :value="model.name"/>
-		<div v-if="!model.carried" class="caption">
-			Not carried
-		</div>
-		<div v-if="model.contentsWeightless" class="caption">
-			Contents are weightless
-		</div>
-		<property-field name="Weight" :value="`${model.weight} lbs`"/>
-		<property-field name="Value" :value="`${model.value} gp`"/>
-		<property-description :value="model.description"/>
+    <property-name :value="model.name" />
+    <div
+      v-if="!model.carried"
+      class="caption"
+    >
+      Not carried
+    </div>
+    <div
+      v-if="model.contentsWeightless"
+      class="caption"
+    >
+      Contents are weightless
+    </div>
+    <property-field
+      name="Weight"
+      :value="`${model.weight} lbs`"
+    />
+    <property-field
+      name="Value"
+      :value="`${model.value} gp`"
+    />
+    <property-description
+      v-if="model.description"
+      :value="model.description"
+    />
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/viewers/ExperienceViewer.vue b/app/imports/ui/properties/viewers/ExperienceViewer.vue
index 13300e83..2db6ded7 100644
--- a/app/imports/ui/properties/viewers/ExperienceViewer.vue
+++ b/app/imports/ui/properties/viewers/ExperienceViewer.vue
@@ -1,22 +1,26 @@
 <template lang="html">
-	<div class="experience-viewer">
-		<div class="display-1" v-if="model.value">
-			{{model.value}} XP
-		</div>
-		<div class="headline layout row mb-3">
-			<property-name :value="model.name"/>
-			<v-spacer/>
-			<div>
-				{{model.worldDate}}
-			</div>
-		</div>
-		<p>
-			{{model.date}}
-		</p>
-		<p v-if="model.description">
-			{{model.description}}
-		</p>
-	</div>
+  <div class="experience-viewer">
+    <div
+      v-if="model.value"
+      class="display-1"
+    >
+      {{ model.value }} XP
+    </div>
+    <div class="headline layout row mb-3">
+      <property-name :value="model.name" />
+      <v-spacer />
+      <div>
+        {{ model.worldDate }}
+      </div>
+    </div>
+    <p>
+      {{ model.date }}
+    </p>
+    <property-description
+      v-if="model.description"
+      :value="model.description"
+    />
+  </div>
 </template>
 
 <script>
diff --git a/app/imports/ui/properties/viewers/FeatureViewer.vue b/app/imports/ui/properties/viewers/FeatureViewer.vue
index 59fda96d..db226427 100644
--- a/app/imports/ui/properties/viewers/FeatureViewer.vue
+++ b/app/imports/ui/properties/viewers/FeatureViewer.vue
@@ -3,7 +3,10 @@
     <property-name :value="model.name" />
     <property-description :value="model.summary" />
     <v-divider class="mt-3 mb-3" />
-    <property-description :value="model.description" />
+    <property-description
+      v-if="model.description"
+      :value="model.description"
+    />
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/viewers/ItemViewer.vue b/app/imports/ui/properties/viewers/ItemViewer.vue
index d7100b38..bae01897 100644
--- a/app/imports/ui/properties/viewers/ItemViewer.vue
+++ b/app/imports/ui/properties/viewers/ItemViewer.vue
@@ -1,11 +1,26 @@
 <template lang="html">
-	<div class="item-viewer">
-		<property-name :value="model.name"/>
-		<property-field name="Plural name" :value="model.plural"/>
-		<property-field name="Quantity" :value="model.quantity"/>
-		<property-field name="Weight" :value="`${model.weight} lbs`"/>
-		<property-field name="Value" :value="`${model.value} gp`"/>
-		<property-description :value="model.description"/>
+  <div class="item-viewer">
+    <property-name :value="model.name" />
+    <property-field
+      name="Plural name"
+      :value="model.plural"
+    />
+    <property-field
+      name="Quantity"
+      :value="model.quantity"
+    />
+    <property-field
+      name="Weight"
+      :value="`${model.weight} lbs`"
+    />
+    <property-field
+      name="Value"
+      :value="`${model.value} gp`"
+    />
+    <property-description
+      v-if="model.description"
+      :value="model.description"
+    />
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/viewers/NoteViewer.vue b/app/imports/ui/properties/viewers/NoteViewer.vue
index 957247ab..cc8a725a 100644
--- a/app/imports/ui/properties/viewers/NoteViewer.vue
+++ b/app/imports/ui/properties/viewers/NoteViewer.vue
@@ -1,8 +1,11 @@
 <template lang="html">
-	<div class="note-viewer">
-		<property-name :value="model.name"/>
-		<property-description :value="model.description"/>
-	</div>
+  <div class="note-viewer">
+    <property-name :value="model.name" />
+    <property-description
+      v-if="model.description"
+      :value="model.description"
+    />
+  </div>
 </template>
 
 <script>
diff --git a/app/imports/ui/properties/viewers/SkillViewer.vue b/app/imports/ui/properties/viewers/SkillViewer.vue
index 7a6d0b6e..03c78338 100644
--- a/app/imports/ui/properties/viewers/SkillViewer.vue
+++ b/app/imports/ui/properties/viewers/SkillViewer.vue
@@ -34,7 +34,10 @@
       name="Base proficiency"
       :value="model.baseProficiency"
     />
-    <property-description :value="model.description" />
+    <property-description
+      v-if="model.description"
+      :value="model.description"
+    />
 
     <effect-viewer
       v-if="computationContext.creature && model.baseValue"
diff --git a/app/imports/ui/properties/viewers/SpellListViewer.vue b/app/imports/ui/properties/viewers/SpellListViewer.vue
index 76966d88..b8cbce8a 100644
--- a/app/imports/ui/properties/viewers/SpellListViewer.vue
+++ b/app/imports/ui/properties/viewers/SpellListViewer.vue
@@ -1,9 +1,15 @@
 <template lang="html">
   <div class="spell-list-viewer">
-		<property-name :value="model.name"/>
-		<property-variable-name :value="model.variableName"/>
-		<property-field name="Maximum prepared spells" :value="model.maxPrepared"/>
-		<property-description :value="model.description"/>
+    <property-name :value="model.name" />
+    <property-variable-name :value="model.variableName" />
+    <property-field
+      name="Maximum prepared spells"
+      :value="model.maxPrepared"
+    />
+    <property-description
+      v-if="model.description"
+      :value="model.description"
+    />
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/viewers/SpellViewer.vue b/app/imports/ui/properties/viewers/SpellViewer.vue
index ceefd901..bd082048 100644
--- a/app/imports/ui/properties/viewers/SpellViewer.vue
+++ b/app/imports/ui/properties/viewers/SpellViewer.vue
@@ -1,11 +1,26 @@
 <template lang="html">
-	<div class="spell-viewer">
-		<property-name :value="model.name"/>
-		<property-field name="Casting time" :value="model.castingTime"/>
-		<property-field name="Range" :value="model.range"/>
-		<property-field name="Duration" :value="model.duration"/>
-		<property-field name="Level" :value="`${model.level} ${model.school}`"/>
-		<property-description :value="model.description"/>
+  <div class="spell-viewer">
+    <property-name :value="model.name" />
+    <property-field
+      name="Casting time"
+      :value="model.castingTime"
+    />
+    <property-field
+      name="Range"
+      :value="model.range"
+    />
+    <property-field
+      name="Duration"
+      :value="model.duration"
+    />
+    <property-field
+      name="Level"
+      :value="`${model.level} ${model.school}`"
+    />
+    <property-description
+      v-if="model.description"
+      :value="model.description"
+    />
   </div>
 </template>