Skip to content

Commit

Permalink
Merge 752a599 into a89e891
Browse files Browse the repository at this point in the history
  • Loading branch information
tusharmath committed Apr 4, 2016
2 parents a89e891 + 752a599 commit 4a297a9
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ const e = require('./src/main')
exports.create = (request, fetch) => e(e, fetch || window.fetch, request)
exports.toJSON = require('./src/toJSON')
exports.reload = require('./src/reload')
exports.isLoading = require('./src/isLoading')
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"author": "tusharmath@gmail.com",
"license": "ISC",
"dependencies": {
"argtoob": "^1.0.2"
"argtoob": "^1.0.2",
"funjector": "^3.1.0"
},
"peerDependencies": {
"rx": "^4.0.8"
Expand Down
4 changes: 2 additions & 2 deletions src/isLoading.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ const Rx = require('rx')
module.exports = function () {
return Rx.Observable.merge(
Array.prototype.map.call(arguments, store => Rx
.Observable.merge(
.Observable.merge(
store.filter(x => x.event === 'REQUEST').map(true),
store.filter(x => x.event === 'RESPONSE').map(false)
).share()
)
)
).distinctUntilChanged()
}

0 comments on commit 4a297a9

Please sign in to comment.