diff options
author | 2019-09-20 12:34:56 +0200 | |
---|---|---|
committer | 2019-09-20 12:34:56 +0200 | |
commit | 1d41b849cb7840a1611d34f20bfe636fc8b903dc (patch) | |
tree | 85d2fe39d8d805008d1ba1c2f458b0cda9224bea /src/components | |
parent | Fix Todos menu (diff) | |
download | ferdium-app-1d41b849cb7840a1611d34f20bfe636fc8b903dc.tar.gz ferdium-app-1d41b849cb7840a1611d34f20bfe636fc8b903dc.tar.zst ferdium-app-1d41b849cb7840a1611d34f20bfe636fc8b903dc.zip |
Implement Quick Switch feature
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/layout/AppLayout.js | 2 | ||||
-rw-r--r-- | src/components/ui/Modal/index.js | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index e82275b9f..2b0719f92 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
@@ -8,6 +8,7 @@ import injectSheet from 'react-jss'; | |||
8 | import InfoBar from '../ui/InfoBar'; | 8 | import InfoBar from '../ui/InfoBar'; |
9 | import { Component as BasicAuth } from '../../features/basicAuth'; | 9 | import { Component as BasicAuth } from '../../features/basicAuth'; |
10 | import { Component as ShareFranz } from '../../features/shareFranz'; | 10 | import { Component as ShareFranz } from '../../features/shareFranz'; |
11 | import { Component as QuickSwitch } from '../../features/quickSwitch'; | ||
11 | import ErrorBoundary from '../util/ErrorBoundary'; | 12 | import ErrorBoundary from '../util/ErrorBoundary'; |
12 | 13 | ||
13 | // import globalMessages from '../../i18n/globalMessages'; | 14 | // import globalMessages from '../../i18n/globalMessages'; |
@@ -185,6 +186,7 @@ class AppLayout extends Component { | |||
185 | )} | 186 | )} |
186 | <BasicAuth /> | 187 | <BasicAuth /> |
187 | <ShareFranz /> | 188 | <ShareFranz /> |
189 | <QuickSwitch /> | ||
188 | {services} | 190 | {services} |
189 | {children} | 191 | {children} |
190 | </div> | 192 | </div> |
diff --git a/src/components/ui/Modal/index.js b/src/components/ui/Modal/index.js index 63d858c47..0af521452 100644 --- a/src/components/ui/Modal/index.js +++ b/src/components/ui/Modal/index.js | |||
@@ -41,6 +41,8 @@ export default @injectCSS(styles) class Modal extends Component { | |||
41 | showClose, | 41 | showClose, |
42 | } = this.props; | 42 | } = this.props; |
43 | 43 | ||
44 | const appRoot = document.getElementById('root'); | ||
45 | |||
44 | return ( | 46 | return ( |
45 | <ReactModal | 47 | <ReactModal |
46 | isOpen={isOpen} | 48 | isOpen={isOpen} |
@@ -53,6 +55,7 @@ export default @injectCSS(styles) class Modal extends Component { | |||
53 | portal={portal} | 55 | portal={portal} |
54 | onRequestClose={close} | 56 | onRequestClose={close} |
55 | shouldCloseOnOverlayClick={shouldCloseOnOverlayClick} | 57 | shouldCloseOnOverlayClick={shouldCloseOnOverlayClick} |
58 | appElement={appRoot} | ||
56 | > | 59 | > |
57 | {showClose && close && ( | 60 | {showClose && close && ( |
58 | <button | 61 | <button |