haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-25 06:33:48 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3369 from haiwen/fix-wiki-bug

Browse Source 
fix index.md bug && update url wikis-->published
This commit is contained in:
Daniel Pan
2019-04-26 16:04:44 +08:00
committed by GitHub
parent 822c982935 fdff270e5c
commit 169fd8af3d
12 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
frontend/src/components/index-viewer.js
View File

@@ -9,7 +9,7 @@ const viewerPropTypes = {
onLinkClick: PropTypes.func.isRequired,
};
const contentClass = 'wiki-page-content';
const contentClass = 'wiki-nav-content';
class IndexContentViewer extends React.Component {
@@ -58,6 +58,7 @@ class IndexContentViewer extends React.Component {
target = target.parentNode;
}
link = target.href;
} else {
link = event.target.href;
}
@@ -86,18 +87,27 @@ class IndexContentViewer extends React.Component {
else if (item.type == 'link') {
url = item.data.href;
let expression = /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[\-;:&=\+\$,\w]+@)?[A-Za-z0-9\.\-]+|(?:www\.|[\-;:&=\+\$,\w]+@)[A-Za-z0-9\.\-]+)((?:\/[\+~%\/\.\w\-_]*)?\??(?:[\-\+=&;%@\.\w_]*)#?(?:[\.\!\/\\\w]*))?)/
let re = new RegExp(expression);
// Solving relative paths
if (!re.test(url)) {
item.data.href = serviceURL + "/published/" + slug + '/' + url;
}
// change file url
if (Utils.isInternalMarkdownLink(url, repoID)) {
else if (Utils.isInternalMarkdownLink(url, repoID)) {
let path = Utils.getPathFromInternalMarkdownLink(url, repoID);
console.log(path);
// replace url
item.data.href = serviceURL + '/wikis/' + slug + path;
item.data.href = serviceURL + '/published/' + slug + path;
}
// change dir url
else if (Utils.isInternalDirLink(url, repoID)) {
let path = Utils.getPathFromInternalDirLink(url, repoID);
// replace url
item.data.href = serviceURL + '/wikis/' + slug + path;
}
item.data.href = serviceURL + '/published/' + slug + path;
}
}
}
@@ -126,7 +136,6 @@ class IndexContentViewer extends React.Component {
</div>
);
}
}
IndexContentViewer.propTypes = viewerPropTypes;

2
frontend/src/components/main-side-nav.js
View File

@@ -200,7 +200,7 @@ class MainSideNav extends React.Component {
}
{enableWiki &&
<li className="nav-item">
<Link className={`nav-link ellipsis ${this.getActiveClass('wikis')}`} to={siteRoot + 'wikis/'} title={gettext('Wikis')} onClick={() => this.tabItemClick('wikis')}>
<Link className={`nav-link ellipsis ${this.getActiveClass('published')}`} to={siteRoot + 'published/'} title={gettext('Published Libraries')} onClick={() => this.tabItemClick('published')}>
<span className="sf2-icon-wiki-view" aria-hidden="true"></span>
<span className="nav-text">{gettext('Published Libraries')}</span>
</Link>

2
frontend/src/components/wiki-dir-list-view/wiki-dir-list-item.js
View File

@@ -38,7 +38,7 @@ class WikiDirListItem extends React.Component {
render() {
let { path, dirent } = this.props;
let href = siteRoot + 'wikis' + Utils.joinPath(path, dirent.name);
let href = siteRoot + 'published' + Utils.joinPath(path, dirent.name);
let iconUrl = Utils.getDirentIcon(dirent);
return (

4
frontend/src/components/wiki-markdown-viewer.js
View File

@@ -151,13 +151,13 @@ class WikiMarkdownViewer extends React.Component {
if (Utils.isInternalMarkdownLink(url, repoID)) {
let path = Utils.getPathFromInternalMarkdownLink(url, repoID);
// replace url
item.data.href = serviceURL + '/wikis/' + slug + path;
item.data.href = serviceURL + '/published/' + slug + path;
}
// change dir url
else if (Utils.isInternalDirLink(url, repoID)) {
let path = Utils.getPathFromInternalDirLink(url, repoID);
// replace url
item.data.href = serviceURL + '/wikis/' + slug + path;
item.data.href = serviceURL + '/published/' + slug + path;
}
}
}