Просмотр исходного кода

impl render with marked options

Yuki Takei 9 лет назад
Родитель
Сommit
0b5b692ff1
2 измененных файлов с 19 добавлено и 11 удалено
  1. 10 1
      resource/js/legacy/crowi-form.js
  2. 9 10
      resource/js/legacy/crowi.js

+ 10 - 1
resource/js/legacy/crowi-form.js

@@ -1,6 +1,15 @@
 $(function() {
   var pageId = $('#content-main').data('page-id');
   var pagePath= $('#content-main').data('path');
+  var isEnabledLineBreaks = $('#content-main').data('linebreaks-enabled');
+
+  // generate options obj
+  var rendererOptions = {
+    // see: https://www.npmjs.com/package/marked
+    marked: {
+      breaks: isEnabledLineBreaks
+    }
+  };
 
   require('bootstrap-sass');
   require('inline-attachment/src/inline-attachment');
@@ -63,7 +72,7 @@ $(function() {
 
   function renderPreview() {
     var markdown = $('#form-body').val();
-    var parsedHTML = crowiRenderer.render(markdown);
+    var parsedHTML = crowiRenderer.render(markdown, rendererOptions);
 
     // create context object
     var context = {markdown, parsedHTML, currentPagePath: location.pathname};

+ 9 - 10
resource/js/legacy/crowi.js

@@ -186,6 +186,14 @@ $(function() {
   var pagePath= $('#content-main').data('path');
   var isEnabledLineBreaks = $('#content-main').data('linebreaks-enabled');
 
+  // generate options obj
+  var rendererOptions = {
+    // see: https://www.npmjs.com/package/marked
+    marked: {
+      breaks: isEnabledLineBreaks
+    }
+  };
+
   Crowi.linkPath();
 
   $('[data-toggle="popover"]').popover();
@@ -372,7 +380,7 @@ $(function() {
         var revisionPath = '#' + id + ' .revision-path';
 
         var markdown = Crowi.unescape($(contentId).html());
-        var parsedHTML = crowiRenderer.render(markdown);
+        var parsedHTML = crowiRenderer.render(markdown, rendererOptions);
         $(revisionBody).html(parsedHTML);
 
         $('.template-create-button', revisionBody).on('click', function() {
@@ -418,15 +426,6 @@ $(function() {
     var $rawTextOriginal = $('#raw-text-original');
     if ($rawTextOriginal.length > 0) {
       var markdown = Crowi.unescape($('#raw-text-original').html());
-
-      // generate options obj
-      var rendererOptions = {
-        // see: https://www.npmjs.com/package/marked
-        marked: {
-          breaks: isEnabledLineBreaks
-        },
-      }
-
       var parsedHTML = crowiRenderer.render(markdown, rendererOptions);
 
       // create context object