summaryrefslogtreecommitdiffstats
path: root/webapp/store
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-06-18 14:42:32 -0400
committerGitHub <noreply@github.com>2017-06-18 14:42:32 -0400
commitab67f6e257f6e8f08145a02a7b93550f99641be4 (patch)
treed33d1c58a3d229f7e37db58bc2c397ac3806c503 /webapp/store
parent0231e95f1c5a8c42ba97875f0d2301815f552974 (diff)
downloadchat-ab67f6e257f6e8f08145a02a7b93550f99641be4.tar.gz
chat-ab67f6e257f6e8f08145a02a7b93550f99641be4.tar.bz2
chat-ab67f6e257f6e8f08145a02a7b93550f99641be4.zip
PLT-6215 Major post list refactor (#6501)
* Major post list refactor * Fix post and thread deletion * Fix preferences not selecting correctly * Fix military time displaying * Fix UP key for editing posts * Fix ESLint error * Various fixes and updates per feedback * Fix for permalink view * Revert to old scrolling method and various fixes * Add floating timestamp, new message indicator, scroll arrows * Update post loading for focus mode and add visibility limit * Fix pinning posts and a react warning * Add loading UI updates from Asaad * Fix refreshing loop * Temporarily bump post visibility limit * Update infinite scrolling * Remove infinite scrolling
Diffstat (limited to 'webapp/store')
-rw-r--r--webapp/store/index.js9
1 files changed, 7 insertions, 2 deletions
diff --git a/webapp/store/index.js b/webapp/store/index.js
index 7ab22e292..6d2fc6d9c 100644
--- a/webapp/store/index.js
+++ b/webapp/store/index.js
@@ -7,6 +7,11 @@ import {General, RequestStatus} from 'mattermost-redux/constants';
import reduxInitialState from 'mattermost-redux/store/initial_state';
import {createTransform, persistStore} from 'redux-persist';
import localForage from 'localforage';
+import appReducer from 'reducers';
+
+function getAppReducer() {
+ return require('../reducers'); // eslint-disable-line global-require
+}
import {transformSet} from './utils';
@@ -99,7 +104,7 @@ export default function configureStore(initialState) {
autoRehydrate: {
log: false
},
- blacklist: ['errors', 'offline', 'requests', 'entities'],
+ blacklist: ['errors', 'offline', 'requests', 'entities', 'views'],
debounce: 500,
transforms: [
setTransformer
@@ -107,6 +112,6 @@ export default function configureStore(initialState) {
}
};
- return configureServiceStore({}, {}, offlineOptions, null, false);
+ return configureServiceStore({}, appReducer, offlineOptions, getAppReducer, false);
}