haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-31 22:54:11 +00:00
Code Issues Releases Wiki Activity

Merge branch '6.3'

Browse Source 
Conflicts:
	frontend/src/pages/wiki/side-panel.js
This commit is contained in:
zhengxie
2018-08-31 11:59:19 +08:00
parent 740d6a86cf 99d6f3b797
commit a3bdae76b2
56 changed files with 1436 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
frontend/src/wiki.js
View File

@@ -92,7 +92,7 @@ class Wiki extends Component {
}
isInternalMarkdownLink(url) {
var re = new RegExp(serviceUrl + '/lib/' + repoID + '/file' + '.*\.md');
var re = new RegExp(serviceUrl + '/lib/' + repoID + '/file' + '.*\.md$');
return re.test(url);
}
@@ -108,6 +108,8 @@ class Wiki extends Component {
if (this.isInternalMarkdownLink(url)) {
let path = this.getPathFromInternalMarkdownLink(url);
this.loadFile(path);
} else {
window.location.href = url;
}
}
@@ -120,6 +122,10 @@ class Wiki extends Component {
onFileClick = (e, node) => {
if (node.isMarkdown()) {
this.loadFile(node.path);
} else {
const w=window.open('about:blank');
const url = serviceUrl + '/lib/' + repoID + '/file' + node.path;
w.location.href = url;
}
}
@@ -140,8 +146,9 @@ class Wiki extends Component {
})
})
let fileUrl = serviceUrl + '/wikis/' + slug + filePath;
window.history.pushState({urlPath: fileUrl, filePath: filePath}, filePath, fileUrl);
const hash = window.location.hash;
let fileUrl = serviceUrl + '/wikis/' + slug + filePath + hash;
window.history.pushState({urlPath: fileUrl, filePath: filePath}, filePath, fileUrl);
}
onpopstate = (event) => {