Encoding <pre> content regardless of the encodeHtml config setting

nozer · May 14, 2018 · 4e32f3d · 4e32f3d
1 parent 6659b9f
commit 4e32f3d
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 12 deletions.
diff --git a/dist/browser/QuillDeltaToHtmlConverter.bundle.js b/dist/browser/QuillDeltaToHtmlConverter.bundle.js
@@ -592,9 +592,9 @@ var QuillDeltaToHtmlConverter = (function () {
         var htmlParts = converter.getHtmlParts();
         if (bop.isCodeBlock()) {
             return htmlParts.openingTag +
-                ops.map(function (iop) {
+                funcs_html_1.encodeHtml(ops.map(function (iop) {
                     return iop.isCustom() ? _this.renderCustom(iop, bop) : iop.insert.value;
-                }).join("")
+                }).join(""))
                 + htmlParts.closingTag;
         }
         var inlines = ops.map(function (op) { return _this._renderInline(op, bop); }).join('');

diff --git a/dist/commonjs/QuillDeltaToHtmlConverter.js b/dist/commonjs/QuillDeltaToHtmlConverter.js
@@ -116,9 +116,9 @@ var QuillDeltaToHtmlConverter = (function () {
         var htmlParts = converter.getHtmlParts();
         if (bop.isCodeBlock()) {
             return htmlParts.openingTag +
-                ops.map(function (iop) {
+                funcs_html_1.encodeHtml(ops.map(function (iop) {
                     return iop.isCustom() ? _this.renderCustom(iop, bop) : iop.insert.value;
-                }).join("")
+                }).join(""))
                 + htmlParts.closingTag;
         }
         var inlines = ops.map(function (op) { return _this._renderInline(op, bop); }).join('');

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "quill-delta-to-html",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "Converts Quill's delta ops to HTML",
   "main": "dist/commonjs/main.js",
   "dependencies": {},

diff --git a/src/QuillDeltaToHtmlConverter.ts b/src/QuillDeltaToHtmlConverter.ts
@@ -7,7 +7,7 @@ import {
    VideoItem, InlineGroup, BlockGroup, ListGroup, ListItem, TDataGroup
 } from './grouper/group-types';
 import { ListNester } from './grouper/ListNester';
-import { makeStartTag, makeEndTag } from './funcs-html';
+import { makeStartTag, makeEndTag, encodeHtml } from './funcs-html';
 import './extensions/Object';
 import { NewLine, GroupType } from './value-types';
 
@@ -169,9 +169,11 @@ class QuillDeltaToHtmlConverter {
 
       if (bop.isCodeBlock()) {
          return htmlParts.openingTag +
-            ops.map((iop) => 
-               iop.isCustom() ? this.renderCustom(iop, bop) : iop.insert.value
-            ).join("")
+            encodeHtml(
+               ops.map((iop) => 
+                  iop.isCustom() ? this.renderCustom(iop, bop) : iop.insert.value
+               ).join("")
+            )
             + htmlParts.closingTag;
       }
 

diff --git a/test/QuillDeltaToHtmlConverter.test.ts b/test/QuillDeltaToHtmlConverter.test.ts
@@ -9,6 +9,8 @@ import { callWhenAlltrue, callWhenXEqualY } from './_helper';
 
 import { delta1 } from './data/delta1';
 import { GroupType } from './../src/value-types';
+import { encodeHtml } from './../src/funcs-html';
+
 
 describe('QuillDeltaToHtmlConverter', function () {
 
@@ -340,24 +342,37 @@ describe('QuillDeltaToHtmlConverter', function () {
                {
                   "insert": "line 3"
                },
+               {
+                  "attributes": {
+                     "code-block": true
+                  },
+                  "insert": "\n"
+               },
+               {
+                  "insert": "<p>line 4</p>"
+               },
                {
                   "attributes": {
                      "code-block": true
                   },
                   "insert": "\n"
                }
             ]
-
+            console.log(encodeHtml("<p>line 4</p>"));
             var qdc = new QuillDeltaToHtmlConverter(ops);
             let html = qdc.convert();
-            assert.equal(html, "<pre>line 1\nline 2\nline 3</pre>");
+            assert.equal(html, ["<pre>line 1\nline 2\nline 3\n", 
+               encodeHtml("<p>line 4</p>"), 
+               "</pre>"].join("")
+            );
 
             qdc = new QuillDeltaToHtmlConverter(ops, {
                multiLineCodeblock: false
             });
             html = qdc.convert();
             assert.equal(
-               '<pre>line 1</pre><pre>line 2</pre><pre>line 3</pre>',
+               '<pre>line 1</pre><pre>line 2</pre><pre>line 3</pre>'+
+               '<pre>'+ encodeHtml("<p>line 4</p>") + '</pre>',
                html);
             qdc = new QuillDeltaToHtmlConverter([ops[0], ops[1]]);
             html = qdc.convert();