Merge bb50774 into dacca9a

mironov · Aug 12, 2016 · 3f34cdd · 3f34cdd
2 parents dacca9a + bb50774
commit 3f34cdd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/build/loading_bar_middleware.js b/build/loading_bar_middleware.js
@@ -21,10 +21,10 @@ function loadingBarMiddleware() {
     var dispatch = _ref.dispatch;
     return function (next) {
       return function (action) {
-        next(action);
+        var nextAction = next(action);
 
         if (action.type === undefined) {
-          return;
+          return false;
         }
 
         var _promiseTypeSuffixes = _slicedToArray(promiseTypeSuffixes, 3);
@@ -43,6 +43,8 @@ function loadingBarMiddleware() {
         } else if (!!action.type.match(isFulfilled) || !!action.type.match(isRejected)) {
           dispatch((0, _loading_bar_ducks.hideLoading)());
         }
+
+        return nextAction;
       };
     };
   };

diff --git a/src/loading_bar_middleware.js b/src/loading_bar_middleware.js
@@ -6,10 +6,10 @@ export default function loadingBarMiddleware(config = {}) {
   const promiseTypeSuffixes = config.promiseTypeSuffixes || defaultTypeSuffixes
 
   return ({ dispatch }) => next => action => {
-    next(action)
+    const nextAction = next(action)
 
     if (action.type === undefined) {
-      return
+      return false
     }
 
     const [PENDING, FULFILLED, REJECTED] = promiseTypeSuffixes
@@ -24,5 +24,7 @@ export default function loadingBarMiddleware(config = {}) {
                !!action.type.match(isRejected)) {
       dispatch(hideLoading())
     }
+
+    return nextAction
   }
 }