Fix markdown logic (fixes #190) (#192)

mozilla · Nov 12, 2020 · 338872e · 338872e
1 parent 4580911
commit 338872e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 17 deletions.
diff --git a/src/components/Markdown.svelte b/src/components/Markdown.svelte
@@ -1,13 +1,9 @@
 <script>
   import marked from "marked";
 
-  let markdown;
-  export let text = "";
+  export let text;
 </script>
 
-{#if markdown}
-  {@html marked.parseInline(markdown.textContent)}
-{/if}
-<div class="raw-markdown hidden" bind:this={markdown}>
-  <slot>{text}</slot>
-</div>
+<slot>
+  {@html marked.parseInline(text)}
+</slot>
diff --git a/src/pages/AppDetail.svelte b/src/pages/AppDetail.svelte
@@ -95,9 +95,7 @@
       {#each filteredPings as ping}
         <li>
           <a href={`/apps/${app.name}/pings/${ping.name}`}>{ping.name}</a>
-          <i>
-            <Markdown>{ping.description}</Markdown>
-          </i>
+          <i><Markdown text={ping.description} /></i>
         </li>
       {:else}
         <p>Your search didn't match any ping.</p>
@@ -114,9 +112,7 @@
         <li>
           <a
             href={`/apps/${params.app}/metrics/${metric.name}`}>{metric.name}</a>
-          <i>
-            <Markdown>{metric.description}</Markdown>
-          </i>
+          <i><Markdown text={metric.description} /></i>
         </li>
       {:else}
         <p>Your search didn't match any metric.</p>

diff --git a/src/pages/MetricDetail.svelte b/src/pages/MetricDetail.svelte
@@ -61,7 +61,7 @@
 {#await metricDataPromise then metric}
   <h1>{metric.name}</h1>
   <p>
-    <Markdown>{metric.description}</Markdown>
+    <Markdown text={metric.description} />
   </p>
   <p>
     <a

diff --git a/src/pages/PingDetail.svelte b/src/pages/PingDetail.svelte
@@ -27,7 +27,7 @@
     <tr>
       <td>Description</td>
       <td>
-        <Markdown>{ping.description}</Markdown>
+        <Markdown text={ping.description} />
       </td>
     </tr>
     <tr>
@@ -77,7 +77,7 @@
       <li>
         <a href={`/apps/${params.app}/metrics/${metric.name}`}>{metric.name}</a>
         <i>
-          <Markdown>{metric.description}</Markdown>
+          <Markdown text={metric.description} />
         </i>
       </li>
     {/each}