yusuketk 5 лет назад
Родитель
Сommit
5dbd8bc5b8

+ 3 - 2
src/client/js/components/PageEditor/LinkEditModal.jsx

@@ -61,10 +61,11 @@ class LinkEditModal extends React.PureComponent {
   // defaultMarkdownLink is an instance of Linker
   // defaultMarkdownLink is an instance of Linker
   show(defaultMarkdownLink = null) {
   show(defaultMarkdownLink = null) {
     // if defaultMarkdownLink is null, set default value in inputs.
     // if defaultMarkdownLink is null, set default value in inputs.
-    const {type=Linker.types.markdownLink, label='', link=''} = defaultMarkdownLink ;
+    const { label = '', link = '' } = defaultMarkdownLink;
+    let { type = Linker.types.markdownLink } = defaultMarkdownLink;
 
 
     // if type of defaultMarkdownLink is pukiwikiLink when pukiwikiLikeLinker plugin is disable, change type(not change label and link)
     // if type of defaultMarkdownLink is pukiwikiLink when pukiwikiLikeLinker plugin is disable, change type(not change label and link)
-    if (type == Linker.types.pukiwikiLink && !this.isApplyPukiwikiLikeLinkerPlugin) {
+    if (type === Linker.types.pukiwikiLink && !this.isApplyPukiwikiLikeLinkerPlugin) {
       type = Linker.types.markdownLink;
       type = Linker.types.markdownLink;
     }
     }
 
 

+ 1 - 1
src/client/js/components/PageEditor/MarkdownLinkUtil.js

@@ -17,7 +17,7 @@ class MarkdownLinkUtil {
       return Linker.fromMarkdownString(editor.getDoc().getSelection());
       return Linker.fromMarkdownString(editor.getDoc().getSelection());
     }
     }
     const curPos = editor.getCursor();
     const curPos = editor.getCursor();
-    return Linker.fromLineWithIndex(editor.getDoc().getLine(curPos.line), curPos.ch)
+    return Linker.fromLineWithIndex(editor.getDoc().getLine(curPos.line), curPos.ch);
   }
   }
 
 
   isInLink(editor) {
   isInLink(editor) {

+ 9 - 8
src/client/js/models/Linker.js

@@ -15,9 +15,9 @@ export default class Linker {
   // create an instance of Linker from string
   // create an instance of Linker from string
   static fromMarkdownString(str) {
   static fromMarkdownString(str) {
     // if str doesn't mean a linker, create a link whose label is str
     // if str doesn't mean a linker, create a link whose label is str
-    let label=str;
-    let link='';
-    let type=this.types.markdownLink;
+    let label = str;
+    let link = '';
+    let type = this.types.markdownLink;
 
 
     // pukiwiki
     // pukiwiki
     // https://regex101.com/r/2fNmUN/1
     // https://regex101.com/r/2fNmUN/1
@@ -69,20 +69,21 @@ export default class Linker {
   // return beginning and end indexies of link
   // return beginning and end indexies of link
   // if index is not in a link, return { beginningOfLink: -1, endOfLink: -1 }
   // if index is not in a link, return { beginningOfLink: -1, endOfLink: -1 }
   static getBeginningAndEndIndexOfLink(line, index) {
   static getBeginningAndEndIndexOfLink(line, index) {
-    let beginningOfLink, endOfLink;
+    let beginningOfLink;
+    let endOfLink;
 
 
     // pukiwiki link ('[[link]]')
     // pukiwiki link ('[[link]]')
     [beginningOfLink, endOfLink] = this.getBeginningAndEndIndexWithPrefixAndSuffix(line, index, '[[', ']]');
     [beginningOfLink, endOfLink] = this.getBeginningAndEndIndexWithPrefixAndSuffix(line, index, '[[', ']]');
 
 
     // if index is not in a pukiwiki link
     // if index is not in a pukiwiki link
     // growi link ('[/link]')
     // growi link ('[/link]')
-    if (beginningOfLink < 0 || endOfLink < 0 || beginningOfLink > index || endOfLink < index){
+    if (beginningOfLink < 0 || endOfLink < 0 || beginningOfLink > index || endOfLink < index) {
       [beginningOfLink, endOfLink] = this.getBeginningAndEndIndexWithPrefixAndSuffix(line, index, '[/', ']');
       [beginningOfLink, endOfLink] = this.getBeginningAndEndIndexWithPrefixAndSuffix(line, index, '[/', ']');
     }
     }
 
 
     // and if index is not in a growi link
     // and if index is not in a growi link
     // markdown link ('[label](link)')
     // markdown link ('[label](link)')
-    if (beginningOfLink < 0 || endOfLink < 0 || beginningOfLink > index || endOfLink < index){
+    if (beginningOfLink < 0 || endOfLink < 0 || beginningOfLink > index || endOfLink < index) {
       [beginningOfLink, endOfLink] = this.getBeginningAndEndIndexWithPrefixAndSuffix(line, index, '[', ')', '](');
       [beginningOfLink, endOfLink] = this.getBeginningAndEndIndexWithPrefixAndSuffix(line, index, '[', ')', '](');
     }
     }
 
 
@@ -90,13 +91,13 @@ export default class Linker {
     // return { beginningOfLink: -1, endOfLink: -1 }
     // return { beginningOfLink: -1, endOfLink: -1 }
     if (beginningOfLink < 0 || endOfLink < 0 || beginningOfLink > index || endOfLink < index) {
     if (beginningOfLink < 0 || endOfLink < 0 || beginningOfLink > index || endOfLink < index) {
       [beginningOfLink, endOfLink] = [-1, -1];
       [beginningOfLink, endOfLink] = [-1, -1];
-    };
+    }
 
 
     return { beginningOfLink, endOfLink };
     return { beginningOfLink, endOfLink };
   }
   }
 
 
   // return begin and end indexies as array only when index is between prefix and suffix and link contains containText.
   // return begin and end indexies as array only when index is between prefix and suffix and link contains containText.
-  static getBeginningAndEndIndexWithPrefixAndSuffix(line, index, prefix, suffix, containText='') {
+  static getBeginningAndEndIndexWithPrefixAndSuffix(line, index, prefix, suffix, containText = '') {
     const beginningIndex = line.lastIndexOf(prefix, index);
     const beginningIndex = line.lastIndexOf(prefix, index);
     const IndexOfContainText = line.indexOf(containText, beginningIndex + prefix.length);
     const IndexOfContainText = line.indexOf(containText, beginningIndex + prefix.length);
     const endIndex = line.indexOf(suffix, IndexOfContainText + containText.length);
     const endIndex = line.indexOf(suffix, IndexOfContainText + containText.length);