Просмотр исходного кода

GC-704 modify conditions for start/resume with HackMD Editor

Yuki Takei 7 лет назад
Родитель
Сommit
274077cd90
2 измененных файлов с 3 добавлено и 5 удалено
  1. 2 4
      resource/js/app.js
  2. 1 1
      resource/js/components/PageEditorByHackmd.jsx

+ 2 - 4
resource/js/app.js

@@ -194,11 +194,9 @@ const saveWithShortcutSuccessHandler = function(page) {
   if (componentInstances.pageEditorByHackmd != null) {
     // clear state of PageEditorByHackmd
     componentInstances.pageEditorByHackmd.clearRevisionStatus(pageRevisionId, pageRevisionIdHackmdSynced);
-
-    //// ensure not to update HackMD content being edited and reset -- 2018.08.06 Yuki Takei
-    // const updateEditorValue = (editorMode !== 'hackmd');
-    // componentInstances.pageEditorByHackmd.setMarkdown(page.revision.body, updateEditorValue);
+    // reset
     if (editorMode !== 'hackmd') {
+      componentInstances.pageEditorByHackmd.setMarkdown(page.revision.body, false);
       componentInstances.pageEditorByHackmd.reset();
     }
   }

+ 1 - 1
resource/js/components/PageEditorByHackmd.jsx

@@ -243,7 +243,7 @@ export default class PageEditorByHackmd extends React.PureComponent {
         <div>
           <p className="text-center hackmd-status-label"><i className="fa fa-file-text"></i> HackMD is READY!</p>
           <div className="text-center hackmd-resume-button-container mb-3">
-            <SplitButton id='split-button-resume-hackmd' title={title} bsStyle="success" bsSize="large" disabled={isRevisionOutdated}
+            <SplitButton id='split-button-resume-hackmd' title={title} bsStyle="success" bsSize="large"
                 className="btn-resume waves-effect waves-light" onClick={() => this.resumeToEdit()}>
               <MenuItem className="text-center" onClick={() => this.discardChanges()}>
                 <i className="icon-control-rewind"></i> Discard changes