diff --git a/frontend/src/pages/markdown-editor/rich-editor/comment-item.js b/frontend/src/pages/markdown-editor/rich-markdown-editor/comment-item.js similarity index 98% rename from frontend/src/pages/markdown-editor/rich-editor/comment-item.js rename to frontend/src/pages/markdown-editor/rich-markdown-editor/comment-item.js index 107a640305..52f4e1b5cf 100644 --- a/frontend/src/pages/markdown-editor/rich-editor/comment-item.js +++ b/frontend/src/pages/markdown-editor/rich-markdown-editor/comment-item.js @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { processor } from '@seafile/seafile-editor/dist/utils/seafile-markdown2html'; +import { processor } from '@seafile/seafile-editor'; import { Button, Dropdown, DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap'; import { gettext } from '../../../utils/constants'; diff --git a/frontend/src/pages/markdown-editor/rich-editor/comment-panel.js b/frontend/src/pages/markdown-editor/rich-markdown-editor/comment-panel.js similarity index 100% rename from frontend/src/pages/markdown-editor/rich-editor/comment-panel.js rename to frontend/src/pages/markdown-editor/rich-markdown-editor/comment-panel.js diff --git a/frontend/src/pages/markdown-editor/rich-editor/detail-list-view.js b/frontend/src/pages/markdown-editor/rich-markdown-editor/detail-list-view.js similarity index 100% rename from frontend/src/pages/markdown-editor/rich-editor/detail-list-view.js rename to frontend/src/pages/markdown-editor/rich-markdown-editor/detail-list-view.js diff --git a/frontend/src/pages/markdown-editor/rich-editor/index.js b/frontend/src/pages/markdown-editor/rich-markdown-editor/index.js similarity index 92% rename from frontend/src/pages/markdown-editor/rich-editor/index.js rename to frontend/src/pages/markdown-editor/rich-markdown-editor/index.js index 4e1410efde..1843a54e0e 100644 --- a/frontend/src/pages/markdown-editor/rich-editor/index.js +++ b/frontend/src/pages/markdown-editor/rich-markdown-editor/index.js @@ -1,7 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { Toolbar, MarkdownEditor, UserHelp } from '@seafile/seafile-editor'; -import EditorBuilder from '@seafile/seafile-editor/dist/editor/editor-builder'; +import { EditorBuilder, Toolbar, MarkdownEditor, UserHelp } from '@seafile/seafile-editor'; import SidePanel from './side-panel'; import '../css/rich-editor.css'; @@ -14,7 +13,6 @@ const propTypes = { fileInfo: PropTypes.object, readOnly: PropTypes.bool, editorApi: PropTypes.object, - collabUsers: PropTypes.array, onSave: PropTypes.func.isRequired, onChange: PropTypes.func.isRequired, resetRichValue: PropTypes.func, @@ -22,9 +20,10 @@ const propTypes = { onFileTagChanged: PropTypes.func, participants: PropTypes.array, onParticipantsChange: PropTypes.func, + openDialogs: PropTypes.func, }; -class RichEditor extends React.Component { +class RichMarkdownEditor extends React.Component { constructor(props) { super(props); @@ -121,7 +120,7 @@ class RichEditor extends React.Component { } } -RichEditor.propTypes = propTypes; +RichMarkdownEditor.propTypes = propTypes; -export default RichEditor; +export default RichMarkdownEditor; diff --git a/frontend/src/pages/markdown-editor/rich-editor/side-panel.js b/frontend/src/pages/markdown-editor/rich-markdown-editor/side-panel.js similarity index 100% rename from frontend/src/pages/markdown-editor/rich-editor/side-panel.js rename to frontend/src/pages/markdown-editor/rich-markdown-editor/side-panel.js diff --git a/frontend/src/pages/markdown-editor/seafile-editor/index.js b/frontend/src/pages/markdown-editor/seafile-editor/index.js index 1a181491e1..9976188bc9 100644 --- a/frontend/src/pages/markdown-editor/seafile-editor/index.js +++ b/frontend/src/pages/markdown-editor/seafile-editor/index.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import { deserialize, serialize, PlainMarkdownEditor } from '@seafile/seafile-editor'; import toaster from '../../../components/toast'; import { gettext } from '../../../utils/constants'; -import RichEditor from '../rich-editor'; +import RichMarkdownEditor from '../rich-markdown-editor'; const propTypes = { mode: PropTypes.string, @@ -222,7 +222,7 @@ class SeafileEditor extends React.Component { if (this.props.editorMode === 'rich') { return ( -