Skip to content

Commit 7b3f0b7

Browse files
author
Guillaume Chau
committed
fix: subscribe merge strategy, closes #28
1 parent 31a2114 commit 7b3f0b7

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

src/index.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,14 @@ export default {
3737
if (!fromVal) return toVal
3838

3939
const toData = Object.assign({}, omit(toVal, [
40-
'subscribe',
41-
'data',
40+
'$subscribe',
4241
]), toVal.data)
4342
const fromData = Object.assign({}, omit(fromVal, [
44-
'subscribe',
45-
'data',
43+
'$subscribe',
4644
]), fromVal.data)
4745

4846
return Object.assign({
49-
subscribe: merge(toVal.subscribe, fromVal.subscribe),
47+
$subscribe: merge(toVal.$subscribe, fromVal.$subscribe),
5048
}, merge(toData, fromData))
5149
}
5250

0 commit comments

Comments
 (0)