Merge branch 'master' into image-module

This commit is contained in:
khaydarov 2017-01-26 12:00:08 +03:00
commit 2e1bded935
5 changed files with 2098 additions and 2082 deletions

File diff suppressed because it is too large Load diff

File diff suppressed because one or more lines are too long

View file

@ -3,7 +3,7 @@
* Works with DOM
*
* @author Codex Team
* @version 1.3.6
* @version 1.3.8
*/
var content = (function(content) {
@ -158,6 +158,14 @@ var content = (function(content) {
targetBlock = targetBlock.parentNode;
}
/**
* Check is this block was in feed
* If true, than set switched block also covered
*/
if (targetBlock.classList.contains(codex.ui.className.BLOCK_IN_FEED_MODE)) {
newBlock.classList.add(codex.ui.className.BLOCK_IN_FEED_MODE);
}
/** Replacing */
codex.nodes.redactor.replaceChild(newBlock, targetBlock);

View file

@ -1,6 +1,6 @@
{
"name": "codex.editor",
"version": "1.3.2",
"version": "1.3.5",
"description": "Codex Editor. Native JS, based on API and Open Source",
"main": "index.js",
"scripts": {

File diff suppressed because one or more lines are too long