mirror of
https://github.com/codex-team/editor.js
synced 2024-06-02 22:12:27 +02:00
parent
4511194bb9
commit
185eed8cb8
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "codex.editor",
|
"name": "codex.editor",
|
||||||
"version": "2.6.1",
|
"version": "2.6.2",
|
||||||
"description": "Codex Editor. Native JS, based on API and Open Source",
|
"description": "Codex Editor. Native JS, based on API and Open Source",
|
||||||
"main": "build/codex-editor.js",
|
"main": "build/codex-editor.js",
|
||||||
"types": "./types/index.d.ts",
|
"types": "./types/index.d.ts",
|
||||||
|
|
|
@ -153,8 +153,14 @@ export default class Block {
|
||||||
* Get Block's JSON data
|
* Get Block's JSON data
|
||||||
* @return {Object}
|
* @return {Object}
|
||||||
*/
|
*/
|
||||||
get data(): object {
|
get data(): BlockToolData {
|
||||||
return this.save();
|
return this.save().then((savedObject) => {
|
||||||
|
if (savedObject && !_.isEmpty(savedObject.data)) {
|
||||||
|
return savedObject.data;
|
||||||
|
} else {
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -243,7 +243,9 @@ export default class BlockManager extends Module {
|
||||||
|
|
||||||
const blockToMergeData = await blockToMerge.data;
|
const blockToMergeData = await blockToMerge.data;
|
||||||
|
|
||||||
await targetBlock.mergeWith(blockToMergeData);
|
if (!_.isEmpty(blockToMergeData)) {
|
||||||
|
await targetBlock.mergeWith(blockToMergeData);
|
||||||
|
}
|
||||||
|
|
||||||
this.removeBlock(blockToMergeIndex);
|
this.removeBlock(blockToMergeIndex);
|
||||||
this.currentBlockIndex = this._blocks.indexOf(targetBlock);
|
this.currentBlockIndex = this._blocks.indexOf(targetBlock);
|
||||||
|
|
|
@ -182,9 +182,8 @@ export default class Sanitizer extends Module {
|
||||||
*/
|
*/
|
||||||
public getInlineToolsConfig(name: string): SanitizerConfig {
|
public getInlineToolsConfig(name: string): SanitizerConfig {
|
||||||
const {Tools} = this.Editor;
|
const {Tools} = this.Editor;
|
||||||
|
const toolsConfig = Tools.getToolSettings(name);
|
||||||
const toolsConfig = Tools.getToolSettings(name),
|
const enableInlineTools = toolsConfig.inlineToolbar || [];
|
||||||
enableInlineTools = toolsConfig.inlineToolbar || [];
|
|
||||||
|
|
||||||
let config = {} as SanitizerConfig;
|
let config = {} as SanitizerConfig;
|
||||||
|
|
||||||
|
|
|
@ -27,12 +27,12 @@ export default class Saver extends Module {
|
||||||
chainData = [];
|
chainData = [];
|
||||||
|
|
||||||
blocks.forEach((block) => {
|
blocks.forEach((block) => {
|
||||||
chainData.push(block.data);
|
chainData.push(block.save());
|
||||||
});
|
});
|
||||||
|
|
||||||
const extractedData = await Promise.all(chainData);
|
const extractedData = await Promise.all(chainData);
|
||||||
|
|
||||||
const sanitizedData = await this.Editor.Sanitizer.sanitizeBlocks(extractedData);
|
const sanitizedData = await this.Editor.Sanitizer.sanitizeBlocks(extractedData);
|
||||||
|
|
||||||
return this.makeOutput(sanitizedData);
|
return this.makeOutput(sanitizedData);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue