LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Packages Projects Releases 238 Wiki Activity

Redux #115

Merged
6ea86b96 merged 57 commits from redux into redux 2017-05-05 22:55:12 +02:00
Conversation 0 Commits 57 Files changed 31 +10 -14
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit cee2f2a626 - Show all commits

24
ui/js/component/app/view.jsx
View file

@ -45,20 +45,16 @@ const App = React.createClass({
} = this.props
const searchQuery = (currentPage == 'discover' && searchTerm ? searchTerm : '')
return (
currentPage == 'watch' ?
<Router /> :
<div id="window" className={ drawerOpen ? 'drawer-open' : 'drawer-closed' }>
<Drawer onCloseDrawer={closeDrawer} viewingPage={currentPage} />
<div id="main-content" className={ headerLinks ? 'with-sub-nav' : 'no-sub-nav' }>
<Header onOpenDrawer={openDrawer} initialQuery={searchQuery} onSearch={search} links={headerLinks} />
<Router />
</div>
{modal == 'upgrade' && <UpgradeModal />}
{modal == 'downloading' && <DownloadingModal />}
{modal == 'error' && <ErrorModal />}
</div>
);
return <div id="window" className={ drawerOpen ? 'drawer-open' : 'drawer-closed' }>
<Drawer onCloseDrawer={closeDrawer} viewingPage={currentPage} />
<div id="main-content" className={ headerLinks ? 'with-sub-nav' : 'no-sub-nav' }>
<Header onOpenDrawer={openDrawer} initialQuery={searchQuery} onSearch={search} links={headerLinks} />
<Router />
</div>
{modal == 'upgrade' && <UpgradeModal />}
{modal == 'downloading' && <DownloadingModal />}
{modal == 'error' && <ErrorModal />}
</div>
}
});