diff options
author | cwm <chriswmartin@protonmail.com> | 2017-12-08 20:13:08 -0600 |
---|---|---|
committer | cwm <chriswmartin@protonmail.com> | 2017-12-08 20:13:08 -0600 |
commit | 47157e07b25f80aa9d2f90591bb59cf32cf593be (patch) | |
tree | 9cbaa6dabd362e3390fa1b1085108d6f1a8e5dd5 /app/javascript/flavours/glitch/features/ui | |
parent | f44c8fd130e51b5d8f707be8fd53ccc81211eb73 (diff) |
merged tootsuite pr #5811 into glitch flavour
Diffstat (limited to 'app/javascript/flavours/glitch/features/ui')
-rw-r--r-- | app/javascript/flavours/glitch/features/ui/components/modal_root.js | 2 | ||||
-rw-r--r-- | app/javascript/flavours/glitch/features/ui/index.js | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/features/ui/components/modal_root.js b/app/javascript/flavours/glitch/features/ui/components/modal_root.js index 61b239283..679578b75 100644 --- a/app/javascript/flavours/glitch/features/ui/components/modal_root.js +++ b/app/javascript/flavours/glitch/features/ui/components/modal_root.js @@ -15,6 +15,7 @@ import { ReportModal, SettingsModal, EmbedModal, + ListEditor, } from 'flavours/glitch/util/async-components'; const MODAL_COMPONENTS = { @@ -29,6 +30,7 @@ const MODAL_COMPONENTS = { 'SETTINGS': SettingsModal, 'ACTIONS': () => Promise.resolve({ default: ActionsModal }), 'EMBED': EmbedModal, + 'LIST_EDITOR': ListEditor, }; export default class ModalRoot extends React.PureComponent { diff --git a/app/javascript/flavours/glitch/features/ui/index.js b/app/javascript/flavours/glitch/features/ui/index.js index 3dee7ca19..698ae996c 100644 --- a/app/javascript/flavours/glitch/features/ui/index.js +++ b/app/javascript/flavours/glitch/features/ui/index.js @@ -39,6 +39,7 @@ import { Blocks, Mutes, PinnedStatuses, + Lists, } from 'flavours/glitch/util/async-components'; import { HotKeys } from 'react-hotkeys'; import { me } from 'flavours/glitch/util/initial_state'; @@ -426,6 +427,7 @@ export default class UI extends React.Component { <WrappedRoute path='/follow_requests' component={FollowRequests} content={children} /> <WrappedRoute path='/blocks' component={Blocks} content={children} /> <WrappedRoute path='/mutes' component={Mutes} content={children} /> + <WrappedRoute path='/lists' component={Lists} content={children} /> <WrappedRoute component={GenericNotFound} content={children} /> </WrappedSwitch> |