deblan-mirror/editor.js
deblan-mirror/editor.js
1
0
Fork 0
mirror of https://github.com/codex-team/editor.js synced 2026-03-16 07:35:48 +01:00
Code Issues Projects Releases Wiki Activity

up

Browse source
This commit is contained in:
Murod Khaydarov 2018-05-25 14:00:44 +03:00
commit d969f7d40d
No known key found for this signature in database
GPG key ID: C480BA53A8D274C5
3 changed files with 14 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

16
build/codex-editor.js
View file

@ -1559,19 +1559,17 @@ var BlockManager = function (_Module) {
var blockToMergeIndex = this._blocks.indexOf(blockToMerge);
return new Promise(function (resolve) {
return Promise.resolve().then(function () {
if (blockToMerge.isEmpty) {
resolve();
} else {
blockToMerge.data.then(function (blockToMergeInfo) {
targetBlock.mergeWith(blockToMergeInfo.data);
resolve();
});
return;
}
return blockToMerge.data.then(function (blockToMergeInfo) {
targetBlock.mergeWith(blockToMergeInfo.data);
});
}).then(function () {
_this4.removeBlock(blockToMergeIndex);

2
build/codex-editor.js.map
View file

File diff suppressed because one or more lines are too long

16
src/components/modules/blockManager.js
View file

@ -206,25 +206,23 @@ export default class BlockManager extends Module {
let blockToMergeIndex = this._blocks.indexOf(blockToMerge);
return new Promise((resolve) => {
return Promise.resolve()
.then( () => {
if (blockToMerge.isEmpty) {
if (blockToMerge.isEmpty) {
resolve();
return;
} else {
}
blockToMerge.data
return blockToMerge.data
.then((blockToMergeInfo) => {
targetBlock.mergeWith(blockToMergeInfo.data);
resolve();
});
}
})
})
.then( () => {
this.removeBlock(blockToMergeIndex);