deblan-mirror/editor.js
deblan-mirror/editor.js
1
0
Fork 0
mirror of https://github.com/codex-team/editor.js synced 2024-06-01 21:42:26 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into release.1.6

Browse source
This commit is contained in:
George Berezhnoy 2017-04-24 20:44:12 +03:00
parent cbef91ea11 50ef10ff51
commit f2ef09ed43
4 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
codex-editor.js
View file

File diff suppressed because one or more lines are too long

2
codex-editor.js.map
View file

File diff suppressed because one or more lines are too long

24
modules/paste.js
View file

@ -197,19 +197,10 @@ module.exports = function (paste) {
*/
var insertPastedParagraphs = function (paragraphs) {
var NEW_BLOCK_TYPE = editor.settings.initialBlockPlugin;
var NEW_BLOCK_TYPE = editor.settings.initialBlockPlugin,
currentNode = editor.content.currentNode;
/**
* If there was no data in working node, remove it
*/
if (editor.core.isBlockEmpty(editor.content.currentNode)) {
editor.content.currentNode.remove();
editor.caret.setToPreviousBlock(editor.caret.inputIndex);
}
paragraphs.forEach(function (paragraph) {
/** Don't allow empty paragraphs */
@ -233,6 +224,17 @@ module.exports = function (paste) {
editor.caret.setToPreviousBlock(editor.caret.getCurrentInputIndex() + 1);
/**
* If there was no data in working node, remove it
*/
if (editor.core.isBlockEmpty(currentNode)) {
currentNode.remove();
editor.ui.saveInputs();
}
};
/**

2
package.json
View file

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