Merge branch 'rewriting-version2.0' into renderer-initial

# Conflicts:
#	build/codex-editor.js
#	build/codex-editor.js.map
#	src/codex.js
This commit is contained in:
Murod Khaydarov 2017-11-25 19:42:58 +03:00
commit b83bd752f9
9 changed files with 631 additions and 344 deletions

View file

@ -74,7 +74,6 @@
}
});
console.log(editor);
var items = [
@ -92,7 +91,6 @@
},
];
// var editor2 = new CodexEditor({
// holderId : 'cdx',
// initialBlock: 'header'