zahmis 5 лет назад
Родитель
Сommit
ed9f30d2e2

+ 2 - 6
src/client/js/app.jsx

@@ -8,12 +8,10 @@ import loggerFactory from '@alias/logger';
 import ErrorBoundary from './components/ErrorBoudary';
 import SearchPage from './components/SearchPage';
 import TagsList from './components/TagsList';
-import ViewEditHackmd from './components/Page/ViewEditHackmd';
-// import PageEditor from './components/PageEditor';
+import DisplaySwitcher from './components/Page/DisplaySwitcher';
 import EditorNavbarBottom from './components/PageEditor/EditorNavbarBottom';
 import { defaultEditorOptions, defaultPreviewOptions } from './components/PageEditor/OptionsSelector';
 import PageEditorByHackmd from './components/PageEditorByHackmd';
-// import Page from './components/Page';
 import PageHistory from './components/PageHistory';
 import PageComments from './components/PageComments';
 import PageTimeline from './components/PageTimeline';
@@ -103,7 +101,6 @@ if (pageContainer.state.pageId != null) {
 if (pageContainer.state.path != null) {
   Object.assign(componentMappings, {
     // eslint-disable-next-line quote-props
-
     'grw-subnav-container': <GrowiSubNavigation />,
     'grw-subnav-switcher-container': <GrowiSubNavigationSwitcher />,
   });
@@ -111,8 +108,7 @@ if (pageContainer.state.path != null) {
 // additional definitions if user is logged in
 if (appContainer.currentUser != null) {
   Object.assign(componentMappings, {
-    'view-edit-hackmd': <ViewEditHackmd />,
-    // 'page-editor': <PageEditor />,
+    'display-switcher': <DisplaySwitcher />,
     'page-editor-navbar-bottom-container': <EditorNavbarBottom />,
   });
   if (pageContainer.state.pageId != null) {

+ 5 - 8
src/client/js/components/Page/ViewEditHackmd.jsx → src/client/js/components/Page/DisplaySwitcher.jsx

@@ -1,28 +1,25 @@
 import React from 'react';
 import propTypes from 'prop-types';
-import PageEditor from '../PageEditor';
-import Page from '../Page';
-import PageEditorByHackmd from '../PageEditorByHackmd';
 import { withUnstatedContainers } from '../UnstatedUtils';
 import NavigationContainer from '../../services/NavigationContainer';
 
 
-const ViewEditHackmd = (props) => {
+const DisplaySwitcher = (props) => {
   const { navigationContainer } = props;
 
   return (
-    <div>
+    <>
       {navigationContainer.state.editorMode === 'view' && 'view'}
       {navigationContainer.state.editorMode === 'edit' && 'edit'}
       {navigationContainer.state.editorMode === 'hackmd' && 'hackmd'}
-    </div>
+    </>
   );
 
 };
 
-ViewEditHackmd.propTypes = {
+DisplaySwitcher.propTypes = {
   navigationContainer: propTypes.instanceOf(NavigationContainer).isRequired,
 };
 
 
-export default withUnstatedContainers(ViewEditHackmd, [NavigationContainer]);
+export default withUnstatedContainers(DisplaySwitcher, [NavigationContainer]);

+ 1 - 1
src/server/views/widget/page_content.html

@@ -39,7 +39,7 @@
 
   {% include 'page_alerts.html' %}
 
-<div class="tab-content" id="view-edit-hackmd">
+<div class="tab-content" id="display-switcher">
   {% if page %}
   <script type="text/template" id="raw-text-original">{{ revision.body.toString() | encodeHTML }}</script>
   {% include '../_form.html' %}