Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitda546bb

Browse files
committed
Merge pull request#4 from frederickfogerty/update-to-redux-1.0
Update to redux 1.0
2 parents0f2c627 +5273fcb commitda546bb

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,13 @@
3333
"mocha":"^2.2.5",
3434
"mocha-jsdom":"^1.0.0",
3535
"react":"^0.13.3",
36-
"redux":"^0.12.0",
36+
"redux":"^1.0.0-rc",
3737
"rx":"^2.5.3",
3838
"sinon":"^1.15.4"
3939
},
4040
"dependencies": {
4141
"flux-standard-action":"^0.6.0",
42+
"react-redux":"^0.2.2",
4243
"react-rx-component":"^0.3.0"
4344
}
4445
}

‎src/__tests__/createConnector-test.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
importcreateConnectorfrom'../createConnector';
2-
import{createRedux}from'redux';
2+
import{createStore,combineReducers}from'redux';
33
import{bindActionCreators}from'../';
4-
import{Provider}from'redux/react';
4+
import{Provider}from'react-redux';
55
import{Observable}from'rx';
66
import{funcSubject}from'react-rx-component';
77
importjsdomfrom'./jsdom';
@@ -26,7 +26,7 @@ describe('createConnector()', () => {
2626
jsdom();
2727

2828
it('creates a Connector-like component using RxJS sequences',()=>{
29-
conststore=createRedux({todos:todoReducer});
29+
conststore=createStore(combineReducers({todos:todoReducer}));
3030

3131
// External source
3232
constincrement$=funcSubject();
@@ -47,7 +47,7 @@ describe('createConnector()', () => {
4747
});
4848

4949
consttree=TestUtils.renderIntoDocument(
50-
<Providerredux={store}>
50+
<Providerstore={store}>
5151
{()=>(
5252
<TodoConnector>
5353
{props=><div{...props}/>}

‎src/createConnector.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ export default function createConnector(selectState, render) {
77
(props$,context$)=>selectState(
88
props$,
99
context$.flatMap(
10-
c=>observableFromStore(c.redux).startWith(c.redux.getState())
10+
c=>observableFromStore(c.store).startWith(c.store.getState())
1111
),
12-
context$.map(c=>c.redux.dispatch)
12+
context$.map(c=>c.store.dispatch),
13+
context$
1314
),
1415
render
1516
);
1617
Connector.displayName='Connector';
17-
Connector.contextTypes={redux:PropTypes.object};
18+
Connector.contextTypes={store:PropTypes.object};
1819
returnConnector;
1920
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp