scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 15:47:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

use lodash instead of assign

Browse source 
this fixes #1500, since lodash works in ie11 but `assign` does not
This commit is contained in:
Matthew Taylor 2017-09-05 12:28:01 -04:00
parent b7f1f5e913
commit 5772eed8f7
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/redux/reducer.js
View file

@ -1,4 +1,5 @@
var combineReducers = require('redux').combineReducers; var combineReducers = require('redux').combineReducers;
var defaults = require('lodash.defaults');
var messageCountReducer = require('./message-count.js').messageCountReducer; var messageCountReducer = require('./message-count.js').messageCountReducer;
var permissionsReducer = require('./permissions.js').permissionsReducer; var permissionsReducer = require('./permissions.js').permissionsReducer;
@ -16,7 +17,7 @@ var sessionReducer = require('./session.js').sessionReducer;
*/ */
module.exports = function (opts) { module.exports = function (opts) {
opts = opts || {}; opts = opts || {};
return combineReducers(Object.assign(opts, { return combineReducers(defaults(opts, {
session: sessionReducer, session: sessionReducer,
permissions: permissionsReducer, permissions: permissionsReducer,
messageCount: messageCountReducer messageCount: messageCountReducer