updated babel-eslint to fix error in linting, returned x from fire fu…

…nction to allow data to pass to chained then on the promise returned from remote call in source Conflicts: package.json
Adiis · Mar 23, 2016 · 2731395 · 2731395
1 parent 753ea37
commit 2731395
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
     "alt-search-docs": "1.0.6",
     "babel-cli": "6.6.5",
     "babel-core": "6.7.4",
-    "babel-eslint": "5.0.0-beta6",
+    "babel-eslint": "5.0.0",
     "babel-loader": "6.2.4",
     "babel-plugin-add-module-exports": "^0.1.2",
     "babel-plugin-external-helpers-2": "6.3.13",

diff --git a/src/store/StoreMixin.js b/src/store/StoreMixin.js
@@ -57,6 +57,7 @@ const StoreMixin = {
               loadCounter -= 1
               action(intercept(x, action, args))
               if (isError) throw x
+              return x
             }
             return this.alt.trapAsync ? () => fire() : fire()
           }