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

Merge branch '11.0'

Browse Source
This commit is contained in:
lian
2024-11-01 16:32:20 +08:00
parent 66403cbe52 c33f4a772f
commit 4d0b95f703
13 changed files with 55 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/dialog/create-folder-dialog.js
View File

@@ -46,7 +46,7 @@ class CreateForder extends React.Component {
if (!this.state.isSubmitBtnActive) {
return;
}
let newName = this.state.childName;
let newName = this.state.childName.trim();
let { isValid, errMessage } = validateName(newName);
if (!isValid) {
this.setState({ errMessage });

14
frontend/src/components/dirent-grid-view/dirent-grid-view.js
View File

@@ -587,15 +587,23 @@ class DirentGridView extends React.Component {
const path = Utils.encodePath(Utils.joinPath(this.props.path, name));
const cacheBuster = new Date().getTime();
const fileExt = name.substr(name.lastIndexOf('.') + 1).toLowerCase();
const isGIF = fileExt === 'gif';
const src = `${siteRoot}repo/${repoID}/raw${path}?t=${cacheBuster}`;
let thumbnail = '';
const isGIF = fileExt === 'gif';
if (repoEncrypted || isGIF) {
thumbnail = src;
thumbnail = `${siteRoot}repo/${repoID}/raw${path}?t=${cacheBuster}`;
} else {
thumbnail = `${siteRoot}thumbnail/${repoID}/${thumbnailSizeForOriginal}${path}`;
}
let src = '';
const isTIFF = fileExt == 'tiff';
if (isTIFF) {
src = `${siteRoot}thumbnail/${repoID}/${thumbnailSizeForOriginal}${path}`;
} else {
src = `${siteRoot}repo/${repoID}/raw${path}`;
}
return {
name,
thumbnail,

14
frontend/src/components/dirent-list-view/dirent-list-view.js
View File

@@ -187,15 +187,23 @@ class DirentListView extends React.Component {
const repoEncrypted = this.props.currentRepoInfo.encrypted;
const path = Utils.encodePath(Utils.joinPath(this.props.path, name));
const fileExt = name.substr(name.lastIndexOf('.') + 1).toLowerCase();
const isGIF = fileExt === 'gif';
const src = `${siteRoot}repo/${repoID}/raw${path}`;
let thumbnail = '';
const isGIF = fileExt === 'gif';
if (repoEncrypted || isGIF) {
thumbnail = src;
thumbnail = `${siteRoot}repo/${repoID}/raw${path}`;
} else {
thumbnail = `${siteRoot}thumbnail/${repoID}/${thumbnailSizeForOriginal}${path}`;
}
let src = '';
const isTIFF = fileExt == 'tiff';
if (isTIFF) {
src = `${siteRoot}thumbnail/${repoID}/${thumbnailSizeForOriginal}${path}`;
} else {
src = `${siteRoot}repo/${repoID}/raw${path}`;
}
return {
name,
thumbnail,