Przeglądaj źródła

The revisionId specified in query is now the initial value.

Ryu Sato 5 lat temu
rodzic
commit
adada9c486
1 zmienionych plików z 6 dodań i 4 usunięć
  1. 6 4
      src/client/js/components/RevisionCompare.jsx

+ 6 - 4
src/client/js/components/RevisionCompare.jsx

@@ -3,12 +3,16 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 import { withTranslation } from 'react-i18next';
 
 
 import { withUnstatedContainers } from './UnstatedUtils';
 import { withUnstatedContainers } from './UnstatedUtils';
+import PageContainer from '../services/PageContainer';
 import RevisionCompareContainer from '../services/RevisionCompareContainer';
 import RevisionCompareContainer from '../services/RevisionCompareContainer';
 import RevisionDiff from './PageHistory/RevisionDiff';
 import RevisionDiff from './PageHistory/RevisionDiff';
 
 
 class PageCompare extends React.Component {
 class PageCompare extends React.Component {
   componentWillMount() {
   componentWillMount() {
-    const { revisionCompareContainer, fromRevisionId, toRevisionId } = this.props;
+    const { revisionCompareContainer } = this.props;
+    const { pageContainer } = revisionCompareContainer;
+    const { compareRevisionIds } = pageContainer.state;
+    const [fromRevisionId, toRevisionId] = compareRevisionIds;
 
 
     revisionCompareContainer.fetchPageRevisionBody(fromRevisionId, toRevisionId);
     revisionCompareContainer.fetchPageRevisionBody(fromRevisionId, toRevisionId);
     revisionCompareContainer.fetchPageRevisions();
     revisionCompareContainer.fetchPageRevisions();
@@ -56,7 +60,7 @@ class PageCompare extends React.Component {
     return (
     return (
       <div id="revision-compare-content">
       <div id="revision-compare-content">
         <div>{ t('page_compare_revision.comparing_changes') }</div>
         <div>{ t('page_compare_revision.comparing_changes') }</div>
-        <div class="container">
+        <div class="container-fluid px-0">
           <div class="row">
           <div class="row">
             { fromRevSelector }
             { fromRevSelector }
             { toRevSelector }
             { toRevSelector }
@@ -88,8 +92,6 @@ const PageCompareWrapper = withUnstatedContainers(PageCompare, [RevisionCompareC
 PageCompare.propTypes = {
 PageCompare.propTypes = {
   t: PropTypes.func.isRequired, // i18next
   t: PropTypes.func.isRequired, // i18next
   revisionCompareContainer: PropTypes.instanceOf(RevisionCompareContainer).isRequired,
   revisionCompareContainer: PropTypes.instanceOf(RevisionCompareContainer).isRequired,
-  fromRevisionId: PropTypes.string,
-  toRevisionId: PropTypes.string,
 };
 };
 
 
 export default withTranslation()(PageCompareWrapper);
 export default withTranslation()(PageCompareWrapper);