Merge remote-tracking branch 'origin/master'

# Conflicts:
#	codex-editor.js
This commit is contained in:
khaydarov 2016-06-04 20:28:49 +03:00
commit ac36b80a83

View file

@ -3,6 +3,7 @@
* https://ifmo.su/editor
* @author CodeX team team@ifmo.su
*/
var cEditor = (function (cEditor) {
// Default settings
@ -484,7 +485,7 @@ cEditor.content = {
* Make new node with original content
*/
var nodeCreated = cEditor.draw.block(newBlockTagname, targetBlock.innerHTML);
/**
* If it is a first-level node, replace as-is.
*/