mirror of
https://github.com/haiwen/seahub.git
synced 2025-09-04 16:31:13 +00:00
fix md convert to sdoc (#6331)
This commit is contained in:
@@ -316,7 +316,7 @@ class FileUploader extends React.Component {
|
|||||||
|
|
||||||
onFileUploadSuccess = (resumableFile, message) => {
|
onFileUploadSuccess = (resumableFile, message) => {
|
||||||
let formData = resumableFile.formData;
|
let formData = resumableFile.formData;
|
||||||
let currentTime = new Date().getTime()/1000;
|
let currentTime = new Date().getTime() / 1000;
|
||||||
message = formData.replace ? message : JSON.parse(message)[0];
|
message = formData.replace ? message : JSON.parse(message)[0];
|
||||||
if (formData.relative_path) { // upload folder
|
if (formData.relative_path) { // upload folder
|
||||||
let relative_path = formData.relative_path;
|
let relative_path = formData.relative_path;
|
||||||
|
@@ -313,7 +313,7 @@ class FileUploader extends React.Component {
|
|||||||
|
|
||||||
onFileUploadSuccess = (resumableFile, message) => {
|
onFileUploadSuccess = (resumableFile, message) => {
|
||||||
let formData = resumableFile.formData;
|
let formData = resumableFile.formData;
|
||||||
let currentTime = new Date().getTime()/1000;
|
let currentTime = new Date().getTime() / 1000;
|
||||||
message = formData.replace ? message : JSON.parse(message)[0];
|
message = formData.replace ? message : JSON.parse(message)[0];
|
||||||
if (formData.relative_path) { // upload folder
|
if (formData.relative_path) { // upload folder
|
||||||
// 'upload folder' is not supported
|
// 'upload folder' is not supported
|
||||||
|
@@ -21,6 +21,8 @@ class Alert extends React.PureComponent {
|
|||||||
return 'sf3-font sf3-font-exclamation-circle';
|
return 'sf3-font sf3-font-exclamation-circle';
|
||||||
case 'danger':
|
case 'danger':
|
||||||
return 'sf3-font sf3-font-exclamation-circle';
|
return 'sf3-font sf3-font-exclamation-circle';
|
||||||
|
case 'notify-in-progress':
|
||||||
|
return 'loading-icon';
|
||||||
default:
|
default:
|
||||||
return 'sf3-font sf3-font-check-circle';
|
return 'sf3-font sf3-font-check-circle';
|
||||||
}
|
}
|
||||||
|
@@ -25,7 +25,7 @@ export default class Toast extends React.PureComponent {
|
|||||||
/**
|
/**
|
||||||
* The type of the alert.
|
* 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.
|
* The title of the alert.
|
||||||
|
@@ -78,6 +78,15 @@
|
|||||||
color: rgb(236, 76, 71);
|
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 {
|
.seahub-toast-alert-container .toast-alert-icon {
|
||||||
margin-right: 10px;
|
margin-right: 10px;
|
||||||
width: 14px;
|
width: 14px;
|
||||||
|
@@ -52,6 +52,10 @@ export default class Toaster {
|
|||||||
return this.notifyHandler(title, { ...settings, intent: 'none' });
|
return this.notifyHandler(title, { ...settings, intent: 'none' });
|
||||||
};
|
};
|
||||||
|
|
||||||
|
notifyInProgress = (title, settings = {}) => {
|
||||||
|
return this.notifyHandler(title, { ...settings, intent: 'notify-in-progress' });
|
||||||
|
};
|
||||||
|
|
||||||
success = (title, settings = {}) => {
|
success = (title, settings = {}) => {
|
||||||
return this.notifyHandler(title, { ...settings, intent: 'success' });
|
return this.notifyHandler(title, { ...settings, intent: 'success' });
|
||||||
};
|
};
|
||||||
|
@@ -237,7 +237,7 @@ class LibContentView extends React.Component {
|
|||||||
|
|
||||||
onRepoUpdateEvent = () => {
|
onRepoUpdateEvent = () => {
|
||||||
let currentTime = new Date();
|
let currentTime = new Date();
|
||||||
if ((parseFloat(currentTime - this.lastModifyTime)/1000) <= 5) {
|
if ((parseFloat(currentTime - this.lastModifyTime) / 1000) <= 5) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
let repoID = this.props.repoID;
|
let repoID = this.props.repoID;
|
||||||
@@ -1303,7 +1303,6 @@ class LibContentView extends React.Component {
|
|||||||
return dirent;
|
return dirent;
|
||||||
});
|
});
|
||||||
if (dirent) {
|
if (dirent) {
|
||||||
// dirent.isSelected = true;
|
|
||||||
this.setState({
|
this.setState({
|
||||||
direntList: direntList,
|
direntList: direntList,
|
||||||
isDirentSelected: true,
|
isDirentSelected: true,
|
||||||
@@ -1793,7 +1792,7 @@ class LibContentView extends React.Component {
|
|||||||
createDirent(name, type, size) {
|
createDirent(name, type, size) {
|
||||||
// use current dirent parent's permission as it's permission
|
// use current dirent parent's permission as it's permission
|
||||||
const { userPerm: permission } = this.state;
|
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 obj = { name, type, mtime, size, permission };
|
||||||
const dirent = new Dirent(obj);
|
const dirent = new Dirent(obj);
|
||||||
return dirent;
|
return dirent;
|
||||||
|
@@ -106,7 +106,7 @@ class MarkdownEditor extends React.Component {
|
|||||||
|
|
||||||
receiveUpdateData (data) {
|
receiveUpdateData (data) {
|
||||||
let currentTime = new Date();
|
let currentTime = new Date();
|
||||||
if ((parseFloat(currentTime - this.lastModifyTime)/1000) <= 5) {
|
if ((parseFloat(currentTime - this.lastModifyTime) / 1000) <= 5) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
editorApi.fileMetaData().then((res) => {
|
editorApi.fileMetaData().then((res) => {
|
||||||
|
@@ -309,7 +309,7 @@ class FileUploader extends React.Component {
|
|||||||
|
|
||||||
onFileUploadSuccess = (resumableFile, message) => {
|
onFileUploadSuccess = (resumableFile, message) => {
|
||||||
let formData = resumableFile.formData;
|
let formData = resumableFile.formData;
|
||||||
let currentTime = new Date().getTime()/1000;
|
let currentTime = new Date().getTime() / 1000;
|
||||||
message = formData.replace ? message : JSON.parse(message)[0];
|
message = formData.replace ? message : JSON.parse(message)[0];
|
||||||
if (formData.relative_path) { // upload folder
|
if (formData.relative_path) { // upload folder
|
||||||
let relative_path = formData.relative_path;
|
let relative_path = formData.relative_path;
|
||||||
|
Reference in New Issue
Block a user