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

fix method name and regular expression add comment

ryohek 5 лет назад
Родитель
Сommit
7eaae903c9

+ 1 - 1
src/client/js/components/PageEditor/CodeMirrorEditor.jsx

@@ -470,7 +470,7 @@ export default class CodeMirrorEditor extends AbstractEditor {
     const hasLinkClass = additionalClassSet.has(MARKDOWN_LINK_ACTIVATED_CLASS);
     const hasLinkClass = additionalClassSet.has(MARKDOWN_LINK_ACTIVATED_CLASS);
 
 
     const isInTable = mtu.isInTable(editor);
     const isInTable = mtu.isInTable(editor);
-    const isInLink = mlu.isInTable(editor);
+    const isInLink = mlu.isInLink(editor);
 
 
     if (!hasCustomClass && isInTable) {
     if (!hasCustomClass && isInTable) {
       additionalClassSet.add(MARKDOWN_TABLE_ACTIVATED_CLASS);
       additionalClassSet.add(MARKDOWN_TABLE_ACTIVATED_CLASS);

+ 4 - 3
src/client/js/components/PageEditor/MarkdownLinkUtil.js

@@ -4,8 +4,9 @@
 class MarkdownLinkUtil {
 class MarkdownLinkUtil {
 
 
   constructor() {
   constructor() {
-    this.linePartOfLink = /^(\[+(.*)+\])(\(+(.*)+\))/;
-    this.isInTable = this.isInTable.bind(this);
+    // https://regex101.com/r/1UuWBJ/7
+    this.linePartOfLink = /(\[+(.*)+\]){1}(\(+(.*)+\)){1}/;
+    this.isInLink = this.isInLink.bind(this);
   }
   }
 
 
   getSelectedTextInEditor(editor) {
   getSelectedTextInEditor(editor) {
@@ -16,7 +17,7 @@ class MarkdownLinkUtil {
     editor.getDoc().replaceSelection(link);
     editor.getDoc().replaceSelection(link);
   }
   }
 
 
-  isInTable(editor) {
+  isInLink(editor) {
     const curPos = editor.getCursor();
     const curPos = editor.getCursor();
     return this.linePartOfLink.test(editor.getDoc().getLine(curPos.line));
     return this.linePartOfLink.test(editor.getDoc().getLine(curPos.line));
   }
   }