Sfoglia il codice sorgente

Merge pull request #5074 from weseek/fix/builtin-editor-scroll-position-on-save

fix: Built-in editor scroll position is reset after save (Introduced by v4.5.3)
Yuki Takei 4 anni fa
parent
commit
ad27c8ab30
1 ha cambiato i file con 4 aggiunte e 4 eliminazioni
  1. 4 4
      packages/app/src/client/services/PageContainer.js

+ 4 - 4
packages/app/src/client/services/PageContainer.js

@@ -5,10 +5,10 @@ import * as entities from 'entities';
 import * as toastr from 'toastr';
 import * as toastr from 'toastr';
 import { pagePathUtils } from '@growi/core';
 import { pagePathUtils } from '@growi/core';
 
 
-import { apiPost } from '../util/apiv1-client';
 import loggerFactory from '~/utils/logger';
 import loggerFactory from '~/utils/logger';
-import { toastError } from '../util/apiNotification';
+import { EditorMode } from '~/stores/ui';
 
 
+import { toastError } from '../util/apiNotification';
 import {
 import {
   DetachCodeBlockInterceptor,
   DetachCodeBlockInterceptor,
   RestoreCodeBlockInterceptor,
   RestoreCodeBlockInterceptor,
@@ -384,7 +384,7 @@ export default class PageContainer extends Container {
     // PageEditor component
     // PageEditor component
     const pageEditor = this.appContainer.getComponentInstance('PageEditor');
     const pageEditor = this.appContainer.getComponentInstance('PageEditor');
     if (pageEditor != null) {
     if (pageEditor != null) {
-      if (editorMode !== 'edit') {
+      if (editorMode !== EditorMode.Editor) {
         pageEditor.updateEditorValue(newState.markdown);
         pageEditor.updateEditorValue(newState.markdown);
       }
       }
     }
     }
@@ -392,7 +392,7 @@ export default class PageContainer extends Container {
     const pageEditorByHackmd = this.appContainer.getComponentInstance('PageEditorByHackmd');
     const pageEditorByHackmd = this.appContainer.getComponentInstance('PageEditorByHackmd');
     if (pageEditorByHackmd != null) {
     if (pageEditorByHackmd != null) {
       // reset
       // reset
-      if (editorMode !== 'hackmd') {
+      if (editorMode !== EditorMode.HackMD) {
         pageEditorByHackmd.reset();
         pageEditorByHackmd.reset();
       }
       }
     }
     }