haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-12 13:24:52 +00:00
Code Issues Releases Wiki Activity

bug repair (#2835)

Browse Source
This commit is contained in:
杨顺强
2019-01-16 15:04:02 +08:00
committed by Daniel Pan
parent ae1eb12896
commit 07f80069ac
2 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
frontend/src/repo-wiki-mode.js
View File

@@ -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;
}

15
frontend/src/wiki.js
View File

@@ -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;
}