public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 01:36:22 +00:00
Code Issues Releases Wiki Activity

Move condition of trash or not

Browse Source
This commit is contained in:
asmsuechan
2017-08-14 10:07:20 +09:00
parent 105119e1a4
commit 7f52eed4d5
2 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
browser/main/NewNoteButton/index.js
View File

@@ -68,27 +68,23 @@ class NewNoteButton extends React.Component {
}
render () {
const { config, style, data, location } = this.props
if (location.pathname === '/trashed') {
return ''
} else {
return (
<div className='NewNoteButton'
styleName={config.isSideNavFolded ? 'root--expanded' : 'root'}
style={style}
>
<div styleName='control'>
<button styleName='control-newNoteButton'
onClick={(e) => this.handleNewNoteButtonClick(e)}>
<i className='fa fa-pencil-square-o' />
<span styleName='control-newNoteButton-tooltip'>
Make a Note {OSX ? '⌘' : '^'} + n
</span>
</button>
</div>
const { config, style, data } = this.props
return (
<div className='NewNoteButton'
styleName={config.isSideNavFolded ? 'root--expanded' : 'root'}
style={style}
>
<div styleName='control'>
<button styleName='control-newNoteButton'
onClick={(e) => this.handleNewNoteButtonClick(e)}>
<i className='fa fa-pencil-square-o' />
<span styleName='control-newNoteButton-tooltip'>
Make a Note {OSX ? '⌘' : '^'} + n
</span>
</button>
</div>
)
}
</div>
)
}
}

7
browser/main/TopBar/index.js
View File

@@ -75,7 +75,7 @@ class TopBar extends React.Component {
}
render () {
let { config, style, data } = this.props
let { config, style, data, location } = this.props
return (
<div className='TopBar'
styleName={config.isSideNavFolded ? 'root--expanded' : 'root'}
@@ -108,7 +108,8 @@ class TopBar extends React.Component {
</div>
</div>
<NewNoteButton
{location.pathname === '/trashed' ? ''
: <NewNoteButton
{..._.pick(this.props, [
'dispatch',
'data',
@@ -116,7 +117,7 @@ class TopBar extends React.Component {
'params',
'location'
])}
/>
/>}
</div>
)
}