kaori 4 лет назад
Родитель
Сommit
a25ab5d559

+ 3 - 3
packages/app/src/components/PageEditor/CodeMirrorEditor.jsx

@@ -159,7 +159,7 @@ export default class CodeMirrorEditor extends AbstractEditor {
       : { dicPath: 'https://cdn.jsdelivr.net/npm/kuromoji@0.1.2/dict' };
 
     // TODO: Get configs from db
-    this.isLintEnabled = true;
+    this.isTextlintEnabled = true;
 
     this.textlintConfig = [
       { name: 'common-misspellings' },
@@ -224,7 +224,7 @@ export default class CodeMirrorEditor extends AbstractEditor {
 
   initTextlintSettings() {
     this.textlintValidator = createValidator(this.textlintConfig);
-    this.codemirrorLintConfig = this.isLintEnabled ? { getAnnotations: this.textlintValidator, async: true } : undefined;
+    this.codemirrorLintConfig = this.isTextlintEnabled ? { getAnnotations: this.textlintValidator, async: true } : undefined;
   }
 
   getCodeMirror() {
@@ -908,7 +908,7 @@ export default class CodeMirrorEditor extends AbstractEditor {
     if (this.props.lineNumbers != null) {
       gutters.push('CodeMirror-linenumbers', 'CodeMirror-foldgutter');
     }
-    if (this.isLintEnabled === true) {
+    if (this.isTextlintEnabled === true) {
       gutters.push('CodeMirror-lint-markers');
     }
 

+ 6 - 6
packages/app/src/components/PageEditor/OptionsSelector.jsx

@@ -34,7 +34,7 @@ class OptionsSelector extends React.Component {
     this.state = {
       isCddMenuOpened: false,
       isMathJaxEnabled,
-      editorCurrentSettings: { isTextlintEnabled: false },
+      isTextlintEnabled: false,
     };
 
     this.availableThemes = [
@@ -119,7 +119,7 @@ class OptionsSelector extends React.Component {
   async onClickTextLintToggle(event) {
     const { appContainer, t } = this.props;
 
-    this.setState({ editorCurrentSettings: !this.state.editorCurrentSettings.isTextlintEnabled });
+    this.setState({ isTextlintEnabled: !this.state.isTextlintEnabled });
 
     try {
       await appContainer.apiv3Put('/personal-setting/editor-settings', { editorCurrentSettings: { isTextlintEnabled: this.state.isTextlintEnabled } });
@@ -226,7 +226,7 @@ class OptionsSelector extends React.Component {
             {this.renderActiveLineMenuItem()}
             {this.renderRealtimeMathJaxMenuItem()}
             {this.renderMarkdownTableAutoFormattingMenuItem()}
-            {this.renderIsTextlintEnabledMenuItem()}
+            {this.renderisTextlintEnabledMenuItem()}
             {/* <DropdownItem divider /> */}
           </DropdownMenu>
 
@@ -306,12 +306,12 @@ class OptionsSelector extends React.Component {
     );
   }
 
-  renderIsTextlintEnabledMenuItem() {
+  renderisTextlintEnabledMenuItem() {
     const { t, editorContainer } = this.props;
 
-    const isActive = this.state.isLintEnabled;
+    const isActive = this.state.isTextlintEnabled;
 
-    console.log('this.state.isLintEnabled', this.state.isLintEnabled);
+    console.log('this.state.isTextlintEnabled', this.state.isTextlintEnabled);
     const iconClasses = ['text-info'];
     if (isActive) {
       iconClasses.push('ti-check');