haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-04 00:20:07 +00:00
Code Issues Releases Wiki Activity

fix md convert to sdoc (#6331)

Browse Source
This commit is contained in:
Michael An
2024-07-11 12:09:57 +08:00
committed by GitHub
parent 0ea64b20a5
commit 00713041c6
9 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/file-uploader/file-uploader.js
View File

@@ -316,7 +316,7 @@ class FileUploader extends React.Component {
onFileUploadSuccess = (resumableFile, message) => {
let formData = resumableFile.formData;
let currentTime = new Date().getTime()/1000;
let currentTime = new Date().getTime() / 1000;
message = formData.replace ? message : JSON.parse(message)[0];
if (formData.relative_path) { // upload folder
let relative_path = formData.relative_path;

2
frontend/src/components/shared-link-file-uploader/file-uploader.js
View File

@@ -313,7 +313,7 @@ class FileUploader extends React.Component {
onFileUploadSuccess = (resumableFile, message) => {
let formData = resumableFile.formData;
let currentTime = new Date().getTime()/1000;
let currentTime = new Date().getTime() / 1000;
message = formData.replace ? message : JSON.parse(message)[0];
if (formData.relative_path) { // upload folder
// 'upload folder' is not supported

2
frontend/src/components/toast/alert.js
View File

@@ -21,6 +21,8 @@ class Alert extends React.PureComponent {
return 'sf3-font sf3-font-exclamation-circle';
case 'danger':
return 'sf3-font sf3-font-exclamation-circle';
case 'notify-in-progress':
return 'loading-icon';
default:
return 'sf3-font sf3-font-check-circle';
}

2
frontend/src/components/toast/toast.js
View File

@@ -25,7 +25,7 @@ export default class Toast extends React.PureComponent {
/**
* The type of the alert.
*/
intent: PropTypes.oneOf(['none', 'success', 'warning', 'danger']).isRequired,
intent: PropTypes.oneOf(['none', 'success', 'warning', 'danger', 'notify-in-progress']).isRequired,
/**
* The title of the alert.

9
frontend/src/components/toast/toaster.css
View File

@@ -78,6 +78,15 @@
color: rgb(236, 76, 71);
}
.seahub-toast-alert-container.notify-in-progress {
border-left: 3px solid rgb(16, 112, 202);
color: rgb(16, 112, 202);
}
.seahub-toast-alert-container.notify-in-progress .loading-icon {
margin: 0;
}
.seahub-toast-alert-container .toast-alert-icon {
margin-right: 10px;
width: 14px;

4
frontend/src/components/toast/toaster.js
View File

@@ -52,6 +52,10 @@ export default class Toaster {
return this.notifyHandler(title, { ...settings, intent: 'none' });
};
notifyInProgress = (title, settings = {}) => {
return this.notifyHandler(title, { ...settings, intent: 'notify-in-progress' });
};
success = (title, settings = {}) => {
return this.notifyHandler(title, { ...settings, intent: 'success' });
};

5
frontend/src/pages/lib-content-view/lib-content-view.js
View File

@@ -237,7 +237,7 @@ class LibContentView extends React.Component {
onRepoUpdateEvent = () => {
let currentTime = new Date();
if ((parseFloat(currentTime - this.lastModifyTime)/1000) <= 5) {
if ((parseFloat(currentTime - this.lastModifyTime) / 1000) <= 5) {
return;
}
let repoID = this.props.repoID;
@@ -1303,7 +1303,6 @@ class LibContentView extends React.Component {
return dirent;
});
if (dirent) {
// dirent.isSelected = true;
this.setState({
direntList: direntList,
isDirentSelected: true,
@@ -1793,7 +1792,7 @@ class LibContentView extends React.Component {
createDirent(name, type, size) {
// use current dirent parent's permission as it's permission
const { userPerm: permission } = this.state;
const mtime = new Date().getTime()/1000;
const mtime = new Date().getTime() / 1000;
const obj = { name, type, mtime, size, permission };
const dirent = new Dirent(obj);
return dirent;

2
frontend/src/pages/markdown-editor/index.js
View File

@@ -106,7 +106,7 @@ class MarkdownEditor extends React.Component {
receiveUpdateData (data) {
let currentTime = new Date();
if ((parseFloat(currentTime - this.lastModifyTime)/1000) <= 5) {
if ((parseFloat(currentTime - this.lastModifyTime) / 1000) <= 5) {
return;
}
editorApi.fileMetaData().then((res) => {

2
frontend/src/pages/upload-link/file-uploader.js
View File

@@ -309,7 +309,7 @@ class FileUploader extends React.Component {
onFileUploadSuccess = (resumableFile, message) => {
let formData = resumableFile.formData;
let currentTime = new Date().getTime()/1000;
let currentTime = new Date().getTime() / 1000;
message = formData.replace ? message : JSON.parse(message)[0];
if (formData.relative_path) { // upload folder
let relative_path = formData.relative_path;