Merge branch 'master' into feat/remove-all-torrents
This commit is contained in:
@@ -12,10 +12,10 @@ const Header = require('../components/header')
|
||||
const TorrentListPage = require('./torrent-list-page')
|
||||
|
||||
const Views = {
|
||||
'home': createGetter(() => TorrentListPage),
|
||||
'player': createGetter(() => require('./player-page')),
|
||||
home: createGetter(() => TorrentListPage),
|
||||
player: createGetter(() => require('./player-page')),
|
||||
'create-torrent': createGetter(() => require('./create-torrent-page')),
|
||||
'preferences': createGetter(() => require('./preferences-page'))
|
||||
preferences: createGetter(() => require('./preferences-page'))
|
||||
}
|
||||
|
||||
const Modals = {
|
||||
@@ -90,8 +90,10 @@ class App extends React.Component {
|
||||
return (<div key={i} className='error'>{error.message}</div>)
|
||||
})
|
||||
return (
|
||||
<div key='errors'
|
||||
className={'error-popover ' + (hasErrors ? 'visible' : 'hidden')}>
|
||||
<div
|
||||
key='errors'
|
||||
className={'error-popover ' + (hasErrors ? 'visible' : 'hidden')}
|
||||
>
|
||||
<div key='title' className='title'>Error</div>
|
||||
{errorElems}
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user