ensure not to reset cursor when save with shortcut key

resource/js/app.js

@@ -155,6 +155,8 @@ Object.keys(componentMappings).forEach((key) => {
  * @param {object} page Page instance
  */
 const saveWithShortcutSuccessHandler = function(page) {
+  const editorMode = crowi.getCrowiForJquery().getCurrentEditorMode();
+
   // show toastr
   toastr.success(undefined, 'Saved successfully', {
     closeButton: true,
@@ -178,12 +180,15 @@ const saveWithShortcutSuccessHandler = function(page) {
   }
   // re-render PageEditor component
   if (componentInstances.pageEditor != null) {
-    componentInstances.pageEditor.setMarkdown(page.revision.body);
+    const updateEditorValue = (editorMode !== 'builtin');
+    componentInstances.pageEditor.setMarkdown(page.revision.body, updateEditorValue);
   }
   // set revision id to PageEditorByHackmd
   if (componentInstances.pageEditorByHackmd != null) {
     componentInstances.pageEditorByHackmd.setRevisionId(pageRevisionId);
-    componentInstances.pageEditorByHackmd.setMarkdown(page.revision.body);
+
+    const updateEditorValue = (editorMode !== 'hackmd');
+    componentInstances.pageEditorByHackmd.setMarkdown(page.revision.body, updateEditorValue);
   }
 };
 
@@ -199,6 +204,11 @@ const errorHandler = function(error) {
 };
 
 const saveWithShortcut = function(markdown) {
+  const editorMode = crowi.getCrowiForJquery().getCurrentEditorMode();
+  if (editorMode == null) {
+    // do nothing
+    return;
+  }
   // get options
   const options = componentInstances.savePageControls.getCurrentOptionsToSave();
 
@@ -226,7 +236,6 @@ const saveWithSubmitButton = function() {
     // do nothing
     return;
   }
-
   // get options
   const options = componentInstances.savePageControls.getCurrentOptionsToSave();
 

resource/js/components/PageEditor.js

@@ -52,7 +52,7 @@ export default class PageEditor extends React.Component {
     this.scrollPreviewByEditorLineWithThrottle = throttle(20, this.scrollPreviewByEditorLine);
     this.scrollPreviewByCursorMovingWithThrottle = throttle(20, this.scrollPreviewByCursorMoving);
     this.scrollEditorByPreviewScrollWithThrottle = throttle(20, this.scrollEditorByPreviewScroll);
-    this.renderWithDebounce = debounce(50, throttle(100, this.renderPreview));
+    this.renderPreviewWithDebounce = debounce(50, throttle(100, this.renderPreview));
     this.saveDraftWithDebounce = debounce(800, this.saveDraft);
   }
 
@@ -65,9 +65,11 @@ export default class PageEditor extends React.Component {
     return this.state.markdown;
   }
 
-  setMarkdown(markdown) {
+  setMarkdown(markdown, updateEditorValue = true) {
     this.setState({ markdown });
-    this.refs.editor.setValue(markdown);
+    if (updateEditorValue) {
+      this.refs.editor.setValue(markdown);
+    }
   }
 
   focusToEditor() {
@@ -104,7 +106,7 @@ export default class PageEditor extends React.Component {
    * @param {string} value
    */
   onMarkdownChanged(value) {
-    this.renderWithDebounce(value);
+    this.renderPreviewWithDebounce(value);
     this.saveDraftWithDebounce();
   }
 

resource/js/components/PageEditorByHackmd.jsx

@@ -49,9 +49,9 @@ export default class PageEditorByHackmd extends React.PureComponent {
       });
   }
 
-  setMarkdown(markdown) {
+  setMarkdown(markdown, updateEditorValue = true) {
     this.setState({ markdown });
-    if (this.state.isInitialized) {
+    if (this.state.isInitialized && updateEditorValue) {
       this.refs.hackmdEditor.setValue(markdown);
     }
   }