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

Merge branch '7.1' into master

Browse Source
This commit is contained in:
lian
2021-02-05 11:55:34 +08:00
parent 1cb10e4dd5 f86d164d17
commit c29a571826
39 changed files with 488 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -171,8 +171,10 @@ class DirentListItem extends React.Component {
onItemClick = (e) => {
e.preventDefault();
const dirent = this.props.dirent;
if (this.state.isRenameing) {
return;
}
if (Utils.imageCheck(dirent.name)) {
this.props.showImagePopup(dirent);
} else {
@@ -664,19 +666,19 @@ class DirentListItem extends React.Component {
);
const mobileItem = (
<tr>
<td>
<td onClick={this.onItemClick}>
<div className="dir-icon">
{dirent.encoded_thumbnail_src ?
<img src={`${siteRoot}${dirent.encoded_thumbnail_src}`} className="thumbnail cursor-pointer" onClick={this.onItemClick} alt="" /> :
<img src={`${siteRoot}${dirent.encoded_thumbnail_src}`} className="thumbnail cursor-pointer" alt="" /> :
<img src={iconUrl} width="24" alt="" />
}
{dirent.is_locked && <img className="locked" src={mediaUrl + 'img/file-locked-32.png'} alt={gettext('locked')} title={lockedInfo}/>}
</div>
</td>
<td>
<td onClick={this.onItemClick}>
{this.state.isRenameing ?
<Rename hasSuffix={dirent.type !== 'dir'} name={dirent.name} onRenameConfirm={this.onRenameConfirm} onRenameCancel={this.onRenameCancel} /> :
<a href={dirent.type === 'dir' ? dirHref : fileHref} onClick={this.onItemClick}>{dirent.name}</a>
<a href={dirent.type === 'dir' ? dirHref : fileHref}>{dirent.name}</a>
}
<br />
{dirent.size && <span className="item-meta-info">{dirent.size}</span>}