mirror of
https://github.com/scratchfoundation/scratch-www.git
synced 2024-11-23 07:38:07 -05:00
use lodash instead of assign
this fixes #1500, since lodash works in ie11 but `assign` does not
This commit is contained in:
parent
b7f1f5e913
commit
5772eed8f7
1 changed files with 2 additions and 1 deletions
|
@ -1,4 +1,5 @@
|
|||
var combineReducers = require('redux').combineReducers;
|
||||
var defaults = require('lodash.defaults');
|
||||
|
||||
var messageCountReducer = require('./message-count.js').messageCountReducer;
|
||||
var permissionsReducer = require('./permissions.js').permissionsReducer;
|
||||
|
@ -16,7 +17,7 @@ var sessionReducer = require('./session.js').sessionReducer;
|
|||
*/
|
||||
module.exports = function (opts) {
|
||||
opts = opts || {};
|
||||
return combineReducers(Object.assign(opts, {
|
||||
return combineReducers(defaults(opts, {
|
||||
session: sessionReducer,
|
||||
permissions: permissionsReducer,
|
||||
messageCount: messageCountReducer
|
||||
|
|
Loading…
Reference in a new issue