1 files changed, 17 insertions, 15 deletions
diff --git a/public/js/extra.js b/public/js/extra.js
index d36592d9..ec7d39da 100644
--- a/public/js/extra.js
+++ b/public/js/extra.js
@@ -156,7 +156,11 @@ export function renderTags (view) {
 }
 
 function slugifyWithUTF8 (text) {
-  let newText = S(text.toLowerCase()).trim().stripTags().dasherize().s
+  // remove html tags and trim spaces
+  let newText = S(text).trim().stripTags().s
+  // replace all spaces in between to dashes
+  newText = newText.replace(/\s+/g, '-')
+  // slugify string to make it valid for attribute
   newText = newText.replace(/([!"#$%&'()*+,./:;<=>?@[\\\]^`{|}~])/g, '')
   return newText
 }
@@ -373,22 +377,19 @@ export function finishView (view) {
       var $value = $(value)
       const $ele = $(value).closest('pre')
 
-      let mermaidError = null
-      window.mermaid.parseError = (err, hash) => {
-        mermaidError = err
+      window.mermaid.mermaidAPI.parse($value.text())
+      $ele.addClass('mermaid')
+      $ele.html($value.text())
+      window.mermaid.init(undefined, $ele)
+    } catch (err) {
+      var errormessage = err
+      if (err.str) {
+        errormessage = err.str
       }
 
-      if (window.mermaidAPI.parse($value.text())) {
-        $ele.addClass('mermaid')
-        $ele.html($value.text())
-        window.mermaid.init(undefined, $ele)
-      } else {
-        throw new Error(mermaidError)
-      }
-    } catch (err) {
       $value.unwrap()
-      $value.parent().append('<div class="alert alert-warning">' + err + '</div>')
-      console.warn(err)
+      $value.parent().append('<div class="alert alert-warning">' + errormessage + '</div>')
+      console.warn(errormessage)
     }
   })
   // abc.js
@@ -1006,9 +1007,10 @@ md.use(markdownitContainer, 'info', { render: renderContainer })
 md.use(markdownitContainer, 'warning', { render: renderContainer })
 md.use(markdownitContainer, 'danger', { render: renderContainer })
 
+let defaultImageRender = md.renderer.rules.image
 md.renderer.rules.image = function (tokens, idx, options, env, self) {
   tokens[idx].attrJoin('class', 'raw')
-  return self.renderToken(...arguments)
+  return defaultImageRender(...arguments)
 }
 md.renderer.rules.list_item_open = function (tokens, idx, options, env, self) {
   tokens[idx].attrJoin('class', 'raw')