Yuki Takei 7 лет назад
Родитель
Сommit
09872b7727
2 измененных файлов с 6 добавлено и 2 удалено
  1. 5 2
      resource/js/app.js
  2. 1 0
      resource/js/components/PageComment/CommentForm.js

+ 5 - 2
resource/js/app.js

@@ -365,6 +365,7 @@ if (writeCommentElem) {
       crowiOriginRenderer={crowiRenderer}
       pageId={pageId}
       pagePath={pagePath}
+      revisionId={pageRevisionId}
       onPostComplete={postCompleteHandler}
       editorOptions={editorOptions}
       slackChannels = {slackChannels}/>,
@@ -475,8 +476,10 @@ socket.on('page:update', function(data) {
     // update PageEditorByHackmd
     const pageEditorByHackmd = componentInstances.pageEditorByHackmd;
     if (pageEditorByHackmd != null) {
-      pageEditorByHackmd.setRevisionId(data.page.revision._id);
-      pageEditorByHackmd.setRevisionIdHackmdSynced(data.page.revisionHackmdSynced._id);
+      const page = data.page;
+      const revisionId = page.revision._id;
+      const revisionIdHackmdSynced = (page.revisionHackmdSynced != null) ? page.revisionHackmdSynced._id : null;
+      pageEditorByHackmd.setRevisionId(revisionId, revisionIdHackmdSynced);
       pageEditorByHackmd.setHasDraftOnHackmd(data.page.hasDraftOnHackmd);
     }
   }

+ 1 - 0
resource/js/components/PageComment/CommentForm.js

@@ -313,6 +313,7 @@ CommentForm.propTypes = {
   crowiOriginRenderer: PropTypes.object.isRequired,
   onPostComplete: PropTypes.func,
   pageId: PropTypes.string,
+  revisionId: PropTypes.string,
   pagePath: PropTypes.string,
   editorOptions: PropTypes.object,
   slackChannels: PropTypes.string,