Merge pull request #323 from harena-lab/development

fix (translator): adjusts in the markdown to HTML conversion
harena-lab · Jan 8, 2022 · d9b6007 · d9b6007
2 parents 0ee2e9a + fbf9e73
commit d9b6007
Show file tree

Hide file tree

Showing 66 changed files with 127 additions and 28 deletions.
diff --git a/src/adonisjs/public/author/images/character.png b/src/adonisjs/public/author/images/character.png
diff --git a/src/adonisjs/public/author/images/character.svg b/src/adonisjs/public/author/images/character.svg
diff --git a/src/adonisjs/public/author/index.html b/src/adonisjs/public/author/index.html
@@ -96,7 +96,7 @@
     <script src="/infra/dcc-rest-proxy.js"></script>
     <script src="/infra/dcc-basic.js"></script>
 
-    <script src="/lib/showdown-2-0-0/showdown.min.js"></script>
+    <script src="/lib/showdown/showdown.min.js"></script>
     <script src="/translator/translator.js"></script>
     <script src="/translator/item-templates.js"></script>
 

diff --git a/src/adonisjs/public/author/partials/template-min.html b/src/adonisjs/public/author/partials/template-min.html
@@ -92,7 +92,7 @@
   <script src="/infra/dcc-rest-proxy.js"></script>
   <script src="/infra/dcc-basic.js"></script>
 
-  <script src="/lib/showdown-2-0-0/showdown.min.js"></script>
+  <script src="/lib/showdown/showdown.min.js"></script>
   <script src="/translator/translator.js"></script>
   <script src="/translator/item-templates.js"></script>
 

diff --git a/src/adonisjs/public/context/playground/index.html b/src/adonisjs/public/context/playground/index.html
@@ -12,7 +12,7 @@
    <link rel="stylesheet" href="../../infra/css/common-player.css">
    <link rel="stylesheet" href="../../infra/css/common-author.css">
 
-   <script src="../../lib/showdown-2-0-0/showdown.min.js"></script>
+   <script src="../../lib/showdown/showdown.min.js"></script>
 
    <script src="../../config/config-standalone.js"></script>
 

diff --git a/src/adonisjs/public/dccs/components/control/dcc-compute.js b/src/adonisjs/public/dccs/components/control/dcc-compute.js
@@ -312,7 +312,7 @@ class DCCCompute extends DCCBase {
   static filterAssignedVariables (compiledSet) {
     let variables = []
     for (let s of compiledSet)
-      if (s[0] != null && !varibles.include(s[0]))
+      if (s[0] != null && !variables.includes(s[0]))
         variables.push(s[0])
     return variables
   }

diff --git a/src/adonisjs/public/dccs/components/visual/dcc-button.js b/src/adonisjs/public/dccs/components/visual/dcc-button.js
@@ -113,7 +113,8 @@ class DCCButton extends DCCBlock {
     // === presentation setup (DCC Block)
     await this._applyRender(html,
       (this._xstyle == 'out-image') ? 'title' : 'innerHTML', null, null,
-      (this.xstyle && this.xstyle == 'in') ? true : false)
+      true)
+      // (this.xstyle && this.xstyle == 'in') ? true : false)
 
     // === post presentation setup
     // <TODO> provisory

diff --git a/src/adonisjs/public/dccs/playground/index.html b/src/adonisjs/public/dccs/playground/index.html
@@ -32,7 +32,6 @@
    <script src="../../dccs/base/property-dcc.js"></script>
    <script src="../../dccs/base/dcc-base.js"></script>
 
-
    <script src="../../dccs/components/control/dcc-timer.js"></script>
    <script src="../../dccs/base/dcc-visual.js"></script>
    <script src="../../dccs/components/visual/dcc-monitor.js"></script>

diff --git a/src/adonisjs/public/lib/README.md b/src/adonisjs/public/lib/README.md
@@ -3,6 +3,11 @@
 ## Plugins CDN - jsDelivr
 https://www.jsdelivr.com
 
+## Showdown
+
+* version 1.9.1
+  https://www.jsdelivr.com/package/npm/showdown
+
 ## Blockly
 
 ### Library

diff --git a/src/adonisjs/public/lib/showdown-2-0-0/showdown.min.js b/src/adonisjs/public/lib/showdown-2-0-0/showdown.min.js
diff --git a/src/adonisjs/public/lib/showdown-2-0-0/showdown.min.js.map b/src/adonisjs/public/lib/showdown-2-0-0/showdown.min.js.map
diff --git a/src/adonisjs/public/lib/showdown/showdown.min.js b/src/adonisjs/public/lib/showdown/showdown.min.js
diff --git a/src/adonisjs/public/lib/showdown/showdown.min.js.map b/src/adonisjs/public/lib/showdown/showdown.min.js.map
diff --git a/src/adonisjs/public/modules/capsule.html b/src/adonisjs/public/modules/capsule.html
@@ -13,7 +13,7 @@
    <script src="../infra/dcc-common-server-proxy.js"></script>
    <script src="../infra/dcc-common-server-address.js"></script>
 
-   <script src="../lib/showdown-2-0-0/showdown.min.js"></script>
+   <script src="../lib/showdown/showdown.min.js"></script>
 
    <script src="../translator/translator.js"></script>
    <script src="../translator/item-templates.js"></script>

diff --git a/...public/player/images/ampliacao-eletro.gif → ...c/player/case/images/ampliacao-eletro.gif b/...public/player/images/ampliacao-eletro.gif → ...c/player/case/images/ampliacao-eletro.gif
diff --git a/...public/player/images/bubble-landscape.png → ...c/player/case/images/bubble-landscape.png b/...public/player/images/bubble-landscape.png → ...c/player/case/images/bubble-landscape.png
diff --git a/.../public/player/images/bubble-portrait.png → ...ic/player/case/images/bubble-portrait.png b/.../public/player/images/bubble-portrait.png → ...ic/player/case/images/bubble-portrait.png
diff --git a/...lic/player/images/call-the-supervisor.svg → ...layer/case/images/call-the-supervisor.svg b/...lic/player/images/call-the-supervisor.svg → ...layer/case/images/call-the-supervisor.svg
diff --git a/...js/public/player/images/case-forklift.png → ...blic/player/case/images/case-forklift.png b/...js/public/player/images/case-forklift.png → ...blic/player/case/images/case-forklift.png
diff --git a/src/adonisjs/public/player/case/images/character.png b/src/adonisjs/public/player/case/images/character.png