Use upstream format bookkeeping to ensure we only render markdown whe…

…n markdown is provided (#2161)
projectblacklight · Apr 18, 2019 · 06bb56c · 06bb56c
1 parent c1bf913
commit 06bb56c
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/app/assets/javascripts/spotlight/block_mixins/formable.js b/app/assets/javascripts/spotlight/block_mixins/formable.js
@@ -29,17 +29,21 @@
       /* Simple to start. Add conditions later */
       if (this.hasTextBlock()) {
         data.text = this.getTextBlockHTML();
+        data.format = 'html';
         if (data.text.length > 0 && this.options.convertToMarkdown) {
           data.text = stToMarkdown(data.text, this.type);
+          data.format = 'markdown';
         }
       }
 
       return data;
     },
 
     loadData: function(data){
-      if (this.hasTextBlock()) {
-        $(this.getTextBlock()).html(SirTrevor.toHTML(data.text, this.type));
+      if (this.options.convertFromMarkdown && data.format !== "html") {
+        this.setTextBlockHTML(SirTrevor.toHTML(data.text, this.type));
+      } else {
+        this.setTextBlockHTML(data.text);
       }
       this.loadFormDataByKey(data);
       this.afterLoadData(data);