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

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

@@ -2,17 +2,20 @@ import React from 'react';
 import propTypes from 'prop-types';
 import propTypes from 'prop-types';
 import { withUnstatedContainers } from '../UnstatedUtils';
 import { withUnstatedContainers } from '../UnstatedUtils';
 import NavigationContainer from '../../services/NavigationContainer';
 import NavigationContainer from '../../services/NavigationContainer';
+import Editor from '../PageEditor/Editor';
+import Page from '../Page';
+import PageEditorByHackmd from '../PageEditorByHackmd';
 
 
 
 
 const DisplaySwitcher = (props) => {
 const DisplaySwitcher = (props) => {
   const { navigationContainer } = props;
   const { navigationContainer } = props;
 
 
   return (
   return (
-    <>
-      {navigationContainer.state.editorMode === 'view' && 'view'}
-      {navigationContainer.state.editorMode === 'edit' && 'edit'}
-      {navigationContainer.state.editorMode === 'hackmd' && 'hackmd'}
-    </>
+    <div className="">
+      {navigationContainer.state.editorMode === 'view' && <Page />}
+      {/* {navigationContainer.state.editorMode === 'edit' && <Editor />} */}
+      {navigationContainer.state.editorMode === 'hackmd' && <PageEditorByHackmd />}
+    </div>
   );
   );
 
 
 };
 };

+ 3 - 4
src/server/views/widget/page_content.html

@@ -28,7 +28,7 @@
   data-share-link-id="{% if sharelink %}{{ sharelink._id|json }}{% endif %}"
   data-share-link-id="{% if sharelink %}{{ sharelink._id|json }}{% endif %}"
   >
   >
 {% else %}
 {% else %}
-<div id="content-main" class="content-main"
+   <div id="content-main" class="content-main"
   data-path="{{ encodeURI(path) }}"
   data-path="{{ encodeURI(path) }}"
   data-current-user="{% if user %}{{ user._id.toString() }}{% endif %}"
   data-current-user="{% if user %}{{ user._id.toString() }}{% endif %}"
   data-slack-channels="{{ slack|default('') }}"
   data-slack-channels="{{ slack|default('') }}"
@@ -39,10 +39,9 @@
 
 
   {% include 'page_alerts.html' %}
   {% include 'page_alerts.html' %}
 
 
-<div class="tab-content" id="display-switcher">
-  {% if page %}
+  <div class="tab-content" id="display-switcher">
   <script type="text/template" id="raw-text-original">{{ revision.body.toString() | encodeHTML }}</script>
   <script type="text/template" id="raw-text-original">{{ revision.body.toString() | encodeHTML }}</script>
   {% include '../_form.html' %}
   {% include '../_form.html' %}
-</div>
+  </div>
 <div id="grw-page-status-alert-container"></div>
 <div id="grw-page-status-alert-container"></div>
 </div>
 </div>