diff options
author | ThibG <thib@sitedethib.com> | 2018-04-16 23:24:51 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-16 23:24:51 +0200 |
commit | 84d0aa7b26b5bd7d088fabf30d4085c1e237be5c (patch) | |
tree | 4f4921cfb8abdb4f7bcf025424c423d940ca4f97 /app/javascript/flavours/glitch/features/ui | |
parent | f879672554fb328571648a46f4440c9ae9b895c7 (diff) | |
parent | 54f5170f591e08bfab89ed77def7fd388a0f552f (diff) |
Merge pull request #429 from ThibG/glitch-soc/features/bookmarks
Fix pinning the bookmarks column (fixes #428)
Diffstat (limited to 'app/javascript/flavours/glitch/features/ui')
-rw-r--r-- | app/javascript/flavours/glitch/features/ui/components/columns_area.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/ui/components/columns_area.js b/app/javascript/flavours/glitch/features/ui/components/columns_area.js index e4556899d..21953ada3 100644 --- a/app/javascript/flavours/glitch/features/ui/components/columns_area.js +++ b/app/javascript/flavours/glitch/features/ui/components/columns_area.js @@ -11,7 +11,7 @@ import BundleContainer from '../containers/bundle_container'; import ColumnLoading from './column_loading'; import DrawerLoading from './drawer_loading'; import BundleColumnError from './bundle_column_error'; -import { Drawer, Notifications, HomeTimeline, CommunityTimeline, PublicTimeline, HashtagTimeline, DirectTimeline, FavouritedStatuses, ListTimeline } from 'flavours/glitch/util/async-components'; +import { Drawer, Notifications, HomeTimeline, CommunityTimeline, PublicTimeline, HashtagTimeline, DirectTimeline, FavouritedStatuses, BookmarkedStatuses, ListTimeline } from 'flavours/glitch/util/async-components'; import detectPassiveEvents from 'detect-passive-events'; import { scrollRight } from 'flavours/glitch/util/scroll'; @@ -25,6 +25,7 @@ const componentMap = { 'HASHTAG': HashtagTimeline, 'DIRECT': DirectTimeline, 'FAVOURITES': FavouritedStatuses, + 'BOOKMARKED': BookmarkedStatuses, 'LIST': ListTimeline, }; |