Fixed sync render failed for showdown wavedrom extension.

jhuix · Nov 29, 2019 · e5e4549 · e5e4549
1 parent 3f18ea6
commit e5e4549
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,7 @@
 node_modules
 /dist
 /lib
-/fonts
+/testdemo
 *-lock.json
 
 # local env files

diff --git a/.npmignore b/.npmignore
@@ -1,6 +1,7 @@
 .DS_Store
 node_modules
 /docs
+/testdemo
 *-lock.json
 .babelrc
 .editorconfig

diff --git a/docs/dist/showdowns.br.min.js b/docs/dist/showdowns.br.min.js
diff --git a/docs/dist/showdowns.br.min.js.map b/docs/dist/showdowns.br.min.js.map
diff --git a/docs/dist/showdowns.min.js b/docs/dist/showdowns.min.js
diff --git a/docs/dist/showdowns.min.js.map b/docs/dist/showdowns.min.js.map
diff --git a/docs/showdowns-features.md b/docs/showdowns-features.md
@@ -2,11 +2,11 @@
 
 # [Showdowns Features](https://jhuix.github.io/showdowns)
 
-[TOC]
-
 [Showdowns](https://github.com/jhuix/showdowns) is a lib that make markdown to html with some extensions of showdown.js.
 Click the link to preview the [showdowns features](https://jhuix.github.io/showdowns).
 
+Showdowns Markdown Syntax, refer to the document -- [Showdown's Markdown Syntax](https://github.com/showdownjs/showdown/wiki/Showdown's-Markdown-syntax).
+
 ## Table
 
 | Return Code | Style | Value | DESC      |

diff --git a/public/showdowns-features.md b/public/showdowns-features.md
@@ -2,11 +2,11 @@
 
 # [Showdowns Features](https://jhuix.github.io/showdowns)
 
-[TOC]
-
 [Showdowns](https://github.com/jhuix/showdowns) is a lib that make markdown to html with some extensions of showdown.js.
 Click the link to preview the [showdowns features](https://jhuix.github.io/showdowns).
 
+Showdowns Markdown Syntax, refer to the document -- [Showdown's Markdown Syntax](https://github.com/showdownjs/showdown/wiki/Showdown's-Markdown-syntax).
+
 ## Table
 
 | Return Code | Style | Value | DESC      |

diff --git a/src/extensions/showdown-wavedrom.js b/src/extensions/showdown-wavedrom.js
@@ -15,8 +15,8 @@ if (typeof wavedrom === 'undefined') {
   var wavedrom = WaveDrom;
 }
 
+let wdCount = 0;
 let indexWD = 0;
-
 function hasWavedrom() {
   return !!wavedrom;
 }
@@ -30,6 +30,12 @@ function renderWavedrom(element, sync) {
   const index = indexWD;
   const id = 'WaveDrom_Display_' + index;
   ++indexWD;
+  // When index of wavwdrom is 0, there will be some special logic in the WaveDrom lib.
+  // So the index needs to be cleared after all WavwDrom element are rendered.
+  --wdCount;
+  if (!wdCount) {
+    indexWD = 0;
+  }
   if (!sync && typeof window !== 'undefined' && window.dispatchEvent) {
     element.id = id;
     Promise.resolve(id).then(elementid => {
@@ -53,6 +59,13 @@ function renderWavedrom(element, sync) {
       el => {
         const obj = window.eval(`(${code})`);
         wavedrom.RenderWaveForm(index, obj, 'WaveDrom_Display_');
+        // Replace the created cache element with the original element with the same id.
+        const wdel = document.getElementById('WaveDrom_Display_' + index);
+        if (el != wdel) {
+          while (wdel.childNodes.length) {
+            el.appendChild(wdel.removeChild(wdel.childNodes[0]));
+          }
+        }
       }
     );
   }
@@ -64,6 +77,7 @@ function renderWavedromElements(elements, skin) {
     return false;
   }
 
+  wdCount = elements.length;
   const sync = hasWavedrom();
   if (typeof window !== 'undefined') {
     if (!sync) {