Skip to content

Jordan/fix group by getter #185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jordangarcia wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Jordan/fix group by getter #185

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
424db11
still something wrong
lyonlai Oct 31, 2015
c1dc8c4
fixed the problem. now can use to compare with the previous one
lyonlai Oct 31, 2015
f77202c
caching fix for notify.
lyonlai Nov 1, 2015
d38b04e
restore the package.json
lyonlai Nov 1, 2015
fe88c19
remove the testing bit.
lyonlai Nov 1, 2015
6beea89
Merge branch 'jordan/refactor-everything!' of https://github.com/opti…
lyonlai Nov 1, 2015
b75d528
tests passed
lyonlai Nov 1, 2015
eb162a1
solve the formatting issue
lyonlai Nov 1, 2015
22bedfb
cover the test case where removing a getter with handler, if there is…
lyonlai Nov 1, 2015
f979b20
Merge branch 'master' into lyonlai-group-by-getter
jordangarcia Nov 3, 2015
f712e7d
Update to fix edge cases of unwatch fn
jordangarcia Nov 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
solve the formatting issue
  • Loading branch information
@lyonlai
lyonlai committed Nov 1, 2015
commit eb162a1cecf3bbd6f0bc3e16cf9faafe3541c0d8
18 changes: 6 additions & 12 deletions src/reactor/fns.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,12 +171,9 @@ exports.addObserver = function(observerState, getter, handler) {
handler: handler,
})

let updatedObserverState = observerState.updateIn(['gettersMap', getter]
, observerIds =>
observerIds
? observerIds.add(currId)
: Immutable.Set([]).add(currId)
)
let updatedObserverState = observerState.updateIn(['gettersMap', getter], observerIds => {
return observerIds ? observerIds.add(currId) : Immutable.Set.of(currId)
})

if (storeDeps.size === 0) {
// no storeDeps means the observer is dependent on any of the state changing
Expand All @@ -185,12 +182,9 @@ exports.addObserver = function(observerState, getter, handler) {
} else {
updatedObserverState = updatedObserverState.withMutations(map => {
storeDeps.forEach(storeId => {
map.updateIn(['stores', storeId]
, getters =>
getters
? getters.add(getter)
: Immutable.Set([]).add(getter)
)
map.updateIn(['stores', storeId], getters => {
return getters ? getters.add(getter) : Immutable.Set.of(getter)
})
})
})
}
Expand Down