haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-24 12:58:34 +00:00
Code Issues Releases Wiki Activity

Merge branch '7.0'

Browse Source
This commit is contained in:
plt
2019-07-03 10:34:37 +08:00
parent c161448685 188f01e6a1
commit 1809079b8e
17 changed files with 131 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/components/index-viewer.js
View File

@@ -199,9 +199,9 @@ class IndexContentViewer extends React.Component {
// translate slate_paragraph_node to treeNode
transParagraph = (paragraphNode) => {
let treeNode;
if (paragraphNode.nodes[0].type === 'link') {
if (paragraphNode.nodes[1] && paragraphNode.nodes[1].type === 'link') {
// paragraph node is a link node
const linkNode = paragraphNode.nodes[0];
const linkNode = paragraphNode.nodes[1];
const textNode = linkNode.nodes[0];
let name = textNode.leaves[0] ? textNode.leaves[0].text : '';
treeNode = new TreeNode({ name: name, href: linkNode.data.href });

2
frontend/src/components/shared-repo-list-view/shared-repo-list-item.js
View File

@@ -367,7 +367,7 @@ class SharedRepoListItem extends React.Component {
{!this.state.isStarred && <i className="far fa-star star-empty cursor-pointer" onClick={this.onStarRepo}></i>}
{this.state.isStarred && <i className="fas fa-star cursor-pointer" onClick={this.onStarRepo}></i>}
</td>
<td><img src={iconUrl} title={repo.iconTitle} alt={iconTitle} width="24" /></td>
<td><img src={iconUrl} title={iconTitle} alt={iconTitle} width="24" /></td>
<td>
{this.state.isRenaming ?
<Rename name={repo.repo_name} onRenameConfirm={this.onRenameConfirm} onRenameCancel={this.onRenameCancel}/> :