WIP: GC-1324: impl RevisionRenderer

src/client/js/components/Page.js → src/client/js/components/Page.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import PageLoader from './Page/PageLoader';
+import RevisionRenderer from './Page/RevisionRenderer';
 import HandsontableModal from './PageEditor/HandsontableModal';
 import MarkdownTable from '../models/MarkdownTable';
 import mtu from './PageEditor/MarkdownTableUtil';
@@ -44,11 +44,10 @@ export default class Page extends React.Component {
     const isMobile = this.props.crowi.isMobile;
 
     return <div className={isMobile ? 'page-mobile' : ''}>
-      <PageLoader
+      <RevisionRenderer
           crowi={this.props.crowi} crowiRenderer={this.props.crowiRenderer}
           markdown={this.state.markdown}
           pagePath={this.props.pagePath}
-          highlightKeywords={this.props.highlightKeywords}
       />
       <HandsontableModal ref='handsontableModal' onSave={this.saveHandlerForHandsontableModal} />
     </div>;
@@ -61,6 +60,5 @@ Page.propTypes = {
   onSaveWithShortcut: PropTypes.func.isRequired,
   markdown: PropTypes.string.isRequired,
   pagePath: PropTypes.string.isRequired,
-  highlightKeywords: PropTypes.string,
   showHeadEditButton: PropTypes.bool,
 };

src/client/js/components/Page/PageLoader.jsx → src/client/js/components/Page/RevisionRenderer.jsx

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 
 import RevisionBody from './RevisionBody';
 
-export default class PageLoader extends React.Component {
+export default class RevisionRenderer extends React.Component {
 
   constructor(props) {
     super(props);
@@ -99,7 +99,7 @@ export default class PageLoader extends React.Component {
   }
 }
 
-PageLoader.propTypes = {
+RevisionRenderer.propTypes = {
   crowi: PropTypes.object.isRequired,
   crowiRenderer: PropTypes.object.isRequired,
   markdown: PropTypes.string.isRequired,

src/client/js/components/SearchPage/SearchResultList.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 
 import GrowiRenderer from '../../util/GrowiRenderer';
 
-import Page from '../Page.js';
+import RevisionRenderer from '../Page/RevisionRenderer';
 
 export default class SearchResultList extends React.Component {
 
@@ -19,7 +19,7 @@ export default class SearchResultList extends React.Component {
       return (
         <div id={page._id} key={page._id} className="search-result-page">
           <h2><a href={page.path}>{page.path}</a></h2>
-          <Page
+          <RevisionRenderer
             crowi={this.props.crowi}
             crowiRenderer={this.growiRenderer}
             markdown={pageBody}

src/client/js/legacy/crowi.js

@@ -17,7 +17,7 @@ require('jquery.cookie');
 require('bootstrap-select');
 
 import GrowiRenderer from '../util/GrowiRenderer';
-import Page from '../components/Page';
+import RevisionRenderer from '../components/Page/RevisionRenderer';
 
 require('./thirdparty-js/agile-admin');
 
@@ -544,7 +544,7 @@ $(function() {
         const pagePath = document.getElementById(id).getAttribute('data-page-path');
         const markdown = entities.decodeHTML($(contentId).html());
 
-        ReactDOM.render(<Page crowi={crowi} crowiRenderer={growiRendererForTimeline} markdown={markdown} pagePath={pagePath} />, revisionBodyElem);
+        ReactDOM.render(<RevisionRenderer crowi={crowi} crowiRenderer={growiRendererForTimeline} markdown={markdown} pagePath={pagePath} />, revisionBodyElem);
       });
 
       $('#view-timeline').data('shown', 1);
@@ -840,6 +840,6 @@ window.addEventListener('keydown', (event) => {
 });
 
 // adjust min-height of page for print temporarily
-window.onbeforeprint = function () {
-  $("#page-wrapper").css("min-height", "0px");
+window.onbeforeprint = function() {
+  $('#page-wrapper').css('min-height', '0px');
 };