Skip to content

Commit d8c0bbc

Browse files
committed
Build native function in place of lodash isObject
A function is still a non-primitive that has a type of Object, so this check was not doing what it should
1 parent 9e9a470 commit d8c0bbc

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

dist/ng-redux.js

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@
9494

9595
var _lodash6 = _interopRequireDefault(_lodash5);
9696

97-
var _lodash7 = __webpack_require__(26);
98-
99-
var _lodash8 = _interopRequireDefault(_lodash7);
100-
10197
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
10298

99+
var isObject = function isObject(x) {
100+
return (typeof x === 'undefined' ? 'undefined' : _typeof(x)) === 'object';
101+
};
102+
103103
function ngReduxProvider() {
104104
var _reducer = undefined;
105105
var _middlewares = undefined;
@@ -108,12 +108,12 @@
108108
var _reducerIsObject = undefined;
109109

110110
this.createStoreWith = function (reducer, middlewares, storeEnhancers, initialState) {
111-
(0, _invariant2.default)((0, _lodash6.default)(reducer) || (0, _lodash8.default)(reducer), 'The reducer parameter passed to createStoreWith must be a Function or an Object. Instead received %s.', typeof reducer === 'undefined' ? 'undefined' : _typeof(reducer));
111+
(0, _invariant2.default)((0, _lodash6.default)(reducer) || isObject(reducer), 'The reducer parameter passed to createStoreWith must be a Function or an Object. Instead received %s.', typeof reducer === 'undefined' ? 'undefined' : _typeof(reducer));
112112

113113
(0, _invariant2.default)(!storeEnhancers || (0, _lodash4.default)(storeEnhancers), 'The storeEnhancers parameter passed to createStoreWith must be an Array. Instead received %s.', typeof storeEnhancers === 'undefined' ? 'undefined' : _typeof(storeEnhancers));
114114

115115
_reducer = reducer;
116-
_reducerIsObject = (0, _lodash8.default)(reducer);
116+
_reducerIsObject = isObject(reducer);
117117
_storeEnhancers = storeEnhancers;
118118
_middlewares = middlewares || [];
119119
_initialState = initialState;
@@ -388,6 +388,9 @@
388388
var queueIndex = -1;
389389

390390
function cleanUpNextTick() {
391+
if (!draining || !currentQueue) {
392+
return;
393+
}
391394
draining = false;
392395
if (currentQueue.length) {
393396
queue = currentQueue.concat(queue);
@@ -922,11 +925,7 @@
922925
if (Symbol.observable) {
923926
result = Symbol.observable;
924927
} else {
925-
if (typeof Symbol['for'] === 'function') {
926-
result = Symbol['for']('observable');
927-
} else {
928-
result = Symbol('observable');
929-
}
928+
result = Symbol('observable');
930929
Symbol.observable = result;
931930
}
932931
} else {

0 commit comments

Comments
 (0)