haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-16 23:29:49 +00:00
Code Issues Releases Wiki Activity

wiki relative image path

Browse Source
This commit is contained in:
Michael An
2019-06-20 14:40:11 +08:00
parent 58997168f7
commit 08579289d7
3 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -127,21 +127,23 @@ class WikiMarkdownViewer extends React.Component {
changeInlineNode = (item) => { changeInlineNode = (item) => {
if (item.object == 'inline') { if (item.object == 'inline') {
let url; let url, imagePath;
// change image url // change image url
if (item.type == 'image' && isPublicWiki) { if (item.type == 'image' && isPublicWiki) {
url = item.data.src; url = item.data.src;
const re = new RegExp(serviceURL + '/lib/' + repoID +'/file.*raw=1'); const re = new RegExp(serviceURL + '/lib/' + repoID +'/file.*raw=1');
// different repo // different repo
if (!re.test(url)) { if (re.test(url)) {
// get image path
let index = url.indexOf('/file');
let index2 = url.indexOf('?');
imagePath = url.substring(index + 5, index2);
} else if (/^\.\.\/*/.test(url) || /^\.\/*/.test(url)) {
imagePath = Utils.pathNormalize(this.props.path, url);
} else {
return; return;
} }
// get image path
let index = url.indexOf('/file');
let index2 = url.indexOf('?');
const imagePath = url.substring(index + 5, index2);
// replace url
item.data.src = serviceURL + '/view-image-via-public-wiki/?slug=' + slug + '&path=' + imagePath; item.data.src = serviceURL + '/view-image-via-public-wiki/?slug=' + slug + '&path=' + imagePath;
} }

1
frontend/src/pages/wiki/main-panel.js
View File

@@ -116,6 +116,7 @@ class MainPanel extends Component {
latestContributor={this.props.latestContributor} latestContributor={this.props.latestContributor}
onLinkClick={this.props.onLinkClick} onLinkClick={this.props.onLinkClick}
isWiki={true} isWiki={true}
path={this.props.path}
/> />
)} )}
{(!this.props.isDataLoading && !this.props.isViewFile) && ( {(!this.props.isDataLoading && !this.props.isViewFile) && (

16
frontend/src/utils/utils.js
View File

@@ -880,6 +880,22 @@ export const Utils = {
return password; return password;
}, },
pathNormalize: function(filePath, relativePath) {
let newPath = relativePath.split('/');
let path = filePath.slice(1, filePath.lastIndexOf('/')).split('/');
for (let i = 0, len = newPath.length; i < len; i++) {
if (newPath[i] === '..') {
path.pop();
newPath.splice(i, 1);
i--;
} else if (newPath[i] === '.') {
newPath.splice(i, 1);
i--;
}
}
return path.concat(newPath).join('/');
},
getEventData: function(event, data) { getEventData: function(event, data) {
if (event.target.dataset) { if (event.target.dataset) {
return event.target.dataset[data]; return event.target.dataset[data];