Browse Source

Merge branch 'master' into dev

pull/1045/head
Artur Arseniev 8 years ago
committed by GitHub
parent
commit
84c2db2a90
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/editor/config/config.js
  2. 1
      src/parser/model/ParserHtml.js

2
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,

1
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;

Loading…
Cancel
Save