about summary refs log tree commit diff
path: root/app/javascript/mastodon/reducers/index.js
diff options
context:
space:
mode:
authorSorin Davidoi <sorin.davidoi@gmail.com>2017-07-09 12:16:08 +0200
committerEugen Rochko <eugen@zeonfederated.com>2017-07-09 12:16:08 +0200
commit37c832cdf7a307511b27e64174ed1a3e160ec66e (patch)
treed06be7f23f6634286ffd7adf4fcddd3cbd6c3384 /app/javascript/mastodon/reducers/index.js
parentf68fa930ea448f5e94057160cfdcc78fec4aba11 (diff)
refactor: Make all reducers sync (#4125)
Diffstat (limited to 'app/javascript/mastodon/reducers/index.js')
-rw-r--r--app/javascript/mastodon/reducers/index.js15
1 files changed, 8 insertions, 7 deletions
diff --git a/app/javascript/mastodon/reducers/index.js b/app/javascript/mastodon/reducers/index.js
index 79062f2f9..919345f16 100644
--- a/app/javascript/mastodon/reducers/index.js
+++ b/app/javascript/mastodon/reducers/index.js
@@ -14,6 +14,10 @@ import status_lists from './status_lists';
 import cards from './cards';
 import reports from './reports';
 import contexts from './contexts';
+import compose from './compose';
+import search from './search';
+import media_attachments from './media_attachments';
+import notifications from './notifications';
 
 const reducers = {
   timelines,
@@ -31,13 +35,10 @@ const reducers = {
   cards,
   reports,
   contexts,
+  compose,
+  search,
+  media_attachments,
+  notifications,
 };
 
-export function createReducer(asyncReducers) {
-  return combineReducers({
-    ...reducers,
-    ...asyncReducers,
-  });
-}
-
 export default combineReducers(reducers);