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

Fix (#2738)

Browse Source 
* Modify image path

* fix markdown file real-time update
This commit is contained in:
C_Q
2018-12-29 16:28:04 +08:00
committed by Daniel Pan
parent c01420e3e9
commit 2637d86eea
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
frontend/src/markdown-editor.js
View File

@@ -43,6 +43,8 @@ class EditorUtilities {
this.repoID = repoID; this.repoID = repoID;
this.filePath = filePath; this.filePath = filePath;
this.serviceUrl = serviceUrl; this.serviceUrl = serviceUrl;
this.name = userName;
this.contact_email = userInfo.contact_email;
} }
saveContent(content) { saveContent(content) {
@@ -74,7 +76,7 @@ class EditorUtilities {
} }
_getImageURL(fileName) { _getImageURL(fileName) {
const url = `${protocol}://${domain}${siteRoot}lib/${repoID}/file/images/${fileName}?raw=1`; const url = this.serviceUrl + '/lib/' + repoID + '/file/images/auto-upload/' + fileName + '?raw=1';
return url; return url;
} }
@@ -88,7 +90,7 @@ class EditorUtilities {
const newFile = new File([blob], name, {type: 'image/png'}); const newFile = new File([blob], name, {type: 'image/png'});
const formData = new FormData(); const formData = new FormData();
formData.append('parent_dir', '/'); formData.append('parent_dir', '/');
formData.append('relative_path', 'images'); formData.append('relative_path', 'images/auto-upload');
formData.append('file', newFile); formData.append('file', newFile);
return {uploadLink, formData}; return {uploadLink, formData};
}).then(({ uploadLink, formData}) => { }).then(({ uploadLink, formData}) => {
@@ -108,7 +110,7 @@ class EditorUtilities {
const newFile = new File([imageFile], imageFile.name, {type: imageFile.type}); const newFile = new File([imageFile], imageFile.name, {type: imageFile.type});
const formData = new FormData(); const formData = new FormData();
formData.append('parent_dir', '/'); formData.append('parent_dir', '/');
formData.append('relative_path', 'images'); formData.append('relative_path', 'images/auto-upload');
formData.append('file', newFile); formData.append('file', newFile);
return seafileAPI.uploadImage(uploadLink, formData); return seafileAPI.uploadImage(uploadLink, formData);
}).then ((res) => { }).then ((res) => {
@@ -257,6 +259,10 @@ class EditorUtilities {
window.location.href = serviceUrl + '/drafts/review/' + res.data.id; window.location.href = serviceUrl + '/drafts/review/' + res.data.id;
}); });
} }
fileMetaData() {
return seafileAPI.fileMetaData(repoID, filePath);
}
} }
const editorUtilities = new EditorUtilities(); const editorUtilities = new EditorUtilities();
@@ -277,6 +283,7 @@ class MarkdownEditor extends React.Component {
starred: false, starred: false,
permission: '', permission: '',
lastModifier: '', lastModifier: '',
id: '',
}, },
collabServer: seafileCollabServer ? seafileCollabServer : null, collabServer: seafileCollabServer ? seafileCollabServer : null,
relatedFiles: [], relatedFiles: [],
@@ -286,7 +293,7 @@ class MarkdownEditor extends React.Component {
componentDidMount() { componentDidMount() {
seafileAPI.getFileInfo(repoID, filePath).then((res) => { seafileAPI.getFileInfo(repoID, filePath).then((res) => {
let { mtime, size, starred, permission, last_modifier_name } = res.data; let { mtime, size, starred, permission, last_modifier_name, id } = res.data;
let lastModifier = last_modifier_name; let lastModifier = last_modifier_name;
this.setState((prevState, props) => ({ this.setState((prevState, props) => ({
@@ -296,7 +303,8 @@ class MarkdownEditor extends React.Component {
size, size,
starred, starred,
permission, permission,
lastModifier lastModifier,
id
} }
})); }));