diff --git a/frontend/src/repo-wiki-mode.js b/frontend/src/repo-wiki-mode.js index 09192a9df5..29da3b9205 100644 --- a/frontend/src/repo-wiki-mode.js +++ b/frontend/src/repo-wiki-mode.js @@ -892,7 +892,7 @@ class Wiki extends Component { } isInternalMarkdownLink(url) { - var re = new RegExp(siteRoot + 'library/' + repoID + '.*/*.md$'); + var re = new RegExp(siteRoot + 'lib/' + repoID + '.*\.md$'); return re.test(url); } @@ -902,7 +902,7 @@ class Wiki extends Component { } getPathFromInternalMarkdownLink(url) { - var re = new RegExp(siteRoot + 'library/' + repoID + '/' + slug + '(.*/*.md)'); + var re = new RegExp(siteRoot + 'lib/' + repoID + '/file' + '(.*\.md)'); var array = re.exec(url); var path = decodeURIComponent(array[1]); return path; @@ -913,15 +913,6 @@ class Wiki extends Component { var array = re.exec(url); var path = decodeURIComponent(array[1]); - var index = path.substring(1).indexOf('/'); - var dirPath = path.substring(index + 1); - re = new RegExp('(^/.*)'); - if (re.test(dirPath)) { - path = dirPath; - } else { - path = '/' + dirPath; - } - return path; } diff --git a/frontend/src/wiki.js b/frontend/src/wiki.js index 52f064d86e..20c5f06012 100644 --- a/frontend/src/wiki.js +++ b/frontend/src/wiki.js @@ -468,7 +468,7 @@ class Wiki extends Component { } isInternalMarkdownLink(url) { - var re = new RegExp(siteRoot + 'library/' + repoID + '.*/*.md$'); + var re = new RegExp(siteRoot + 'lib/' + repoID + '.*\.md$'); return re.test(url); } @@ -478,26 +478,17 @@ class Wiki extends Component { } getPathFromInternalMarkdownLink(url) { - var re = new RegExp(siteRoot + 'library/' + repoID + '/' + slug + '(.*/*.md)'); + var re = new RegExp(siteRoot + 'lib/' + repoID + '/file' + '(.*\.md)'); var array = re.exec(url); var path = decodeURIComponent(array[1]); return path; } getPathFromInternalDirLink(url) { - var re = new RegExp(siteRoot + 'library/' + repoID + '/' + slug + '(/.*)'); + var re = new RegExp(siteRoot + 'library/' + repoID + '/' + slug + '(.*)'); var array = re.exec(url); var path = decodeURIComponent(array[1]); - var index = path.substring(1).indexOf('/'); - var dirPath = path.substring(index + 1); - re = new RegExp('(^/.*)'); - if (re.test(dirPath)) { - path = dirPath; - } else { - path = '/' + dirPath; - } - return path; }