Merge branch 'master' into dev

nopost · Apr 15, 2018 · 84c2db2 · 84c2db2
2 parents 8750bc6 + cd5fdbf
commit 84c2db2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/editor/config/config.js b/src/editor/config/config.js
@@ -98,7 +98,7 @@ module.exports = {
 
   // When false, removes empty text nodes when parsed, unless they contain a space
   keepEmptyTextNodes: 0,
-
+  
   // Return JS of components inside HTML from 'editor.getHtml()'
   jsInHtml: true,
 

diff --git a/src/parser/model/ParserHtml.js b/src/parser/model/ParserHtml.js
@@ -57,7 +57,6 @@ module.exports = config => {
      * @return {Array<Object>}
      */
     parseNode(el) {
-      const config = (c.em && c.em.get('Config')) || {};
       const result = [];
       const nodes = el.childNodes;