-
{this.props.editorUtilities.name}
+
{this.props.editorApi.name}
diff --git a/frontend/src/components/markdown-view/history-list.js b/frontend/src/components/markdown-view/history-list.js
index 36066cfb46..80f24d8af5 100644
--- a/frontend/src/components/markdown-view/history-list.js
+++ b/frontend/src/components/markdown-view/history-list.js
@@ -8,7 +8,7 @@ import { gettext } from '../../utils/constants';
import '../../css/markdown-viewer/history-viewer.css';
const propTypes = {
- editorUtilities: PropTypes.object.isRequired,
+ editorApi: PropTypes.object.isRequired,
showDiffViewer: PropTypes.func.isRequired,
setDiffViewerContent: PropTypes.func.isRequired,
reloadDiffContent: PropTypes.func.isRequired,
@@ -29,24 +29,24 @@ class HistoryList extends React.Component {
}
componentDidMount() {
- this.props.editorUtilities.listFileHistoryRecords(1, this.perPage).then((res) => {
+ this.props.editorApi.listFileHistoryRecords(1, this.perPage).then((res) => {
this.setState({
historyList: res.data.data,
totalReversionCount: res.data.total_count
});
if (res.data.data.length > 1) {
axios.all([
- this.props.editorUtilities.getFileHistoryVersion(res.data.data[0].commit_id, res.data.data[0].path),
- this.props.editorUtilities.getFileHistoryVersion(res.data.data[1].commit_id, res.data.data[1].path)
+ this.props.editorApi.getFileHistoryVersion(res.data.data[0].commit_id, res.data.data[0].path),
+ this.props.editorApi.getFileHistoryVersion(res.data.data[1].commit_id, res.data.data[1].path)
]).then(axios.spread((res1, res2) => {
- axios.all([this.props.editorUtilities.getFileContent(res1.data), this.props.editorUtilities.getFileContent(res2.data)]).then(axios.spread((content1,content2) => {
+ axios.all([this.props.editorApi.getFileContent(res1.data), this.props.editorApi.getFileContent(res2.data)]).then(axios.spread((content1,content2) => {
this.props.showDiffViewer();
this.props.setDiffViewerContent(content1.data, content2.data);
}));
}));
} else {
- this.props.editorUtilities.getFileHistoryVersion(res.data.data[0].commit_id, res.data.data[0].path).then((res) => {
- this.props.editorUtilities.getFileContent(res.data).then((content) => {
+ this.props.editorApi.getFileHistoryVersion(res.data.data[0].commit_id, res.data.data[0].path).then((res) => {
+ this.props.editorApi.getFileContent(res.data).then((content) => {
this.props.showDiffViewer();
this.props.setDiffViewerContent(content.data, '');
});
@@ -62,10 +62,10 @@ class HistoryList extends React.Component {
activeItem: key,
});
axios.all([
- this.props.editorUtilities.getFileHistoryVersion(currentItem.commit_id, currentItem.path),
- this.props.editorUtilities.getFileHistoryVersion(preItem.commit_id, preItem.path)
+ this.props.editorApi.getFileHistoryVersion(currentItem.commit_id, currentItem.path),
+ this.props.editorApi.getFileHistoryVersion(preItem.commit_id, preItem.path)
]).then(axios.spread((res1, res2) => {
- axios.all([this.props.editorUtilities.getFileContent(res1.data), this.props.editorUtilities.getFileContent(res2.data)]).then(axios.spread((content1,content2) => {
+ axios.all([this.props.editorApi.getFileContent(res1.data), this.props.editorApi.getFileContent(res2.data)]).then(axios.spread((content1,content2) => {
this.props.showDiffViewer();
this.props.setDiffViewerContent(content1.data, content2.data);
}));
@@ -84,7 +84,7 @@ class HistoryList extends React.Component {
currentPage: currentPage,
loading : true
});
- this.props.editorUtilities.listFileHistoryRecords(currentPage, this.perPage).then((res) => {
+ this.props.editorApi.listFileHistoryRecords(currentPage, this.perPage).then((res) => {
let currentHistoryList = Object.assign([], this.state.historyList);
this.setState({
historyList: [...currentHistoryList, ...res.data.data],
diff --git a/frontend/src/components/toolbar/cdoc-editor-topbar.js b/frontend/src/components/toolbar/cdoc-editor-topbar.js
deleted file mode 100644
index 2c81786084..0000000000
--- a/frontend/src/components/toolbar/cdoc-editor-topbar.js
+++ /dev/null
@@ -1,93 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { gettext, canGenerateShareLink } from '../../utils/constants';
-import { IconButton, ButtonGroup, CollabUsersButton } from '@seafile/seafile-editor/dist/components/topbarcomponent/editorToolBar';
-import { Dropdown, DropdownToggle, DropdownMenu, DropdownItem, Tooltip } from 'reactstrap';
-import FileInfo from '@seafile/seafile-editor/dist/components/topbarcomponent/file-info';
-
-
-class MoreMenu extends React.PureComponent {
-
- constructor(props) {
- super(props);
- this.state = {
- tooltipOpen: false,
- dropdownOpen: false
- };
- }
-
- tooltipToggle = () => {
- this.setState({ tooltipOpen: !this.state.tooltipOpen });
- }
-
- dropdownToggle = () => {
- this.setState({ dropdownOpen: !this.state.dropdownOpen });
- }
-
- render() {
- return (
-
-
-
- {gettext('More')}
-
-
-
- {gettext('Help')}
-
-
- );
- }
-}
-
-
-class CDOCTopbar extends React.Component {
-
- constructor(props) {
- super(props);
- }
-
- render() {
- let { contentChanged, saving } = this.props;
- return (
-
-
-
-
- {this.props.collabUsers.length > 0 && }
-
- {canGenerateShareLink &&
-
- }
-
- {
- this.props.showFileHistory &&
- }
- {saving ?
-
- :
-
- }
-
-
-
-
-
- );
- }
-}
-
-export default CDOCTopbar;
diff --git a/frontend/src/components/toolbar/markdown-viewer-toolbar.js b/frontend/src/components/toolbar/markdown-viewer-toolbar.js
index 434f7e99ac..91bd5c3d52 100644
--- a/frontend/src/components/toolbar/markdown-viewer-toolbar.js
+++ b/frontend/src/components/toolbar/markdown-viewer-toolbar.js
@@ -1,9 +1,9 @@
import React from 'react';
import PropTypes from 'prop-types';
import { gettext, canGenerateShareLink, isPro, mediaUrl, canLockUnlockFile } from '../../utils/constants';
-import { IconButton, ButtonGroup, CollabUsersButton } from '@seafile/seafile-editor/dist/components/topbarcomponent/editorToolBar';
+import { IconButton, ButtonGroup, CollabUsersButton } from '@seafile/seafile-editor/dist/components/topbar-component/editor-toolbar';
import { Dropdown, DropdownToggle, DropdownMenu, DropdownItem, Tooltip } from 'reactstrap';
-import FileInfo from '@seafile/seafile-editor/dist/components/topbarcomponent/file-info';
+import FileInfo from '@seafile/seafile-editor/dist/components/topbar-component/file-info';
const { seafileCollabServer } = window.app.config;
@@ -11,7 +11,7 @@ const propTypes = {
isDocs: PropTypes.bool.isRequired,
hasDraft: PropTypes.bool.isRequired,
isDraft: PropTypes.bool.isRequired,
- editorUtilities: PropTypes.object.isRequired,
+ editorApi: PropTypes.object.isRequired,
collabUsers: PropTypes.array.isRequired,
fileInfo: PropTypes.object.isRequired,
toggleShareLinkDialog: PropTypes.func.isRequired,
@@ -111,7 +111,7 @@ class MarkdownViewerToolbar extends React.Component {