From 3c04bbddcdf8f379332caf14cd872d5b0f0b8570 Mon Sep 17 00:00:00 2001 From: chris <kokosias@yahoo.gr> Date: Sun, 7 Feb 2021 20:48:21 +0200 Subject: [PATCH] config cleanup --- editors/editoria/src/config/config.js | 8 ++------ .../CustomTagInlineService/CustomTagInlineTool.js | 9 ++++++--- .../src/CustomTagService/CustomTagService.js | 2 +- wax-prosemirror-services/src/CustomTagService/index.js | 10 +++------- 4 files changed, 12 insertions(+), 17 deletions(-) diff --git a/editors/editoria/src/config/config.js b/editors/editoria/src/config/config.js index c66d58b65..03ba626cc 100644 --- a/editors/editoria/src/config/config.js +++ b/editors/editoria/src/config/config.js @@ -1,9 +1,10 @@ import { emDash, ellipsis } from 'prosemirror-inputrules'; import { columnResizing, tableEditing } from 'prosemirror-tables'; import { + InlineAnnotationsService, AnnotationToolGroupService, ImageService, - InlineAnnotationsService, + ImageToolGroupService, LinkService, ListsService, ListToolGroupService, @@ -13,7 +14,6 @@ import { BaseToolGroupService, DisplayBlockLevelService, DisplayToolGroupService, - ImageToolGroupService, TextBlockLevelService, TextToolGroupService, NoteService, @@ -37,10 +37,8 @@ import { BottomInfoService, TransformService, TransformToolGroupService, - TrackOptionsService, TrackOptionsToolGroupService, TrackCommentOptionsToolGroupService, - CustomTagInlineService, CustomTagInlineToolGroupService, CustomTagBlockToolGroupService, CustomTagService, @@ -139,8 +137,6 @@ export default { ], }, - // Always load first CommentsService and LinkService, - //as it matters on how PM treats nodes and marks services: [ new DisplayBlockLevelService(), new DisplayToolGroupService(), diff --git a/wax-prosemirror-services/src/CustomTagService/CustomTagInlineService/CustomTagInlineTool.js b/wax-prosemirror-services/src/CustomTagService/CustomTagInlineService/CustomTagInlineTool.js index bb65ad62f..6b14b78a9 100644 --- a/wax-prosemirror-services/src/CustomTagService/CustomTagInlineService/CustomTagInlineTool.js +++ b/wax-prosemirror-services/src/CustomTagService/CustomTagInlineService/CustomTagInlineTool.js @@ -1,8 +1,7 @@ import React from 'react'; -// eslint-disable-next-line import/no-named-as-default,import/no-named-as-default-member -import Tools from '../../lib/Tools'; import { v4 as uuidv4 } from 'uuid'; import { CustomTagInlineComponent } from 'wax-prosemirror-components'; +import Tools from '../../lib/Tools'; class CustomTagInLineTool extends Tools { title = 'Custom Tag Inline'; @@ -11,7 +10,11 @@ class CustomTagInLineTool extends Tools { renderTool(view) { return ( - <CustomTagInlineComponent item={this.toJSON()} key={uuidv4()} view={view} /> + <CustomTagInlineComponent + item={this.toJSON()} + key={uuidv4()} + view={view} + /> ); } } diff --git a/wax-prosemirror-services/src/CustomTagService/CustomTagService.js b/wax-prosemirror-services/src/CustomTagService/CustomTagService.js index 4f0f7bd29..3728cce66 100644 --- a/wax-prosemirror-services/src/CustomTagService/CustomTagService.js +++ b/wax-prosemirror-services/src/CustomTagService/CustomTagService.js @@ -5,4 +5,4 @@ class CustomTagService extends Service { dependencies = CustomService; } -export default CustomTagService; \ No newline at end of file +export default CustomTagService; diff --git a/wax-prosemirror-services/src/CustomTagService/index.js b/wax-prosemirror-services/src/CustomTagService/index.js index 3f2a55179..9be43edbd 100644 --- a/wax-prosemirror-services/src/CustomTagService/index.js +++ b/wax-prosemirror-services/src/CustomTagService/index.js @@ -1,8 +1,4 @@ -import CustomTagBlockService from "./CustomTagBlockService/CustomTagBlockService"; -import CustomTagInlineService from "./CustomTagInlineService/CustomTagInlineService"; +import CustomTagBlockService from './CustomTagBlockService/CustomTagBlockService'; +import CustomTagInlineService from './CustomTagInlineService/CustomTagInlineService'; - -export default [ - new CustomTagBlockService(), - new CustomTagInlineService() -]; \ No newline at end of file +export default [new CustomTagBlockService(), new CustomTagInlineService()]; -- GitLab