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

Commit3611a29

Browse files
committed
remove store dependencies, use redux thunks
1 parent3993e54 commit3611a29

File tree

27 files changed

+256
-181
lines changed

27 files changed

+256
-181
lines changed

‎lib/actions/alert.js

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
"use strict";
2-
varstore_1=require('../store');
32
var_types_1=require('./_types');
43
functionalertToggle(alert){
5-
varisOpen=store_1.default.getState().alert.open;
6-
if(!alert){
7-
alert={
8-
action:'',
9-
message:'',
10-
open:false,
11-
};
12-
}
13-
else{
14-
alert=Object.assign({},{open:!isOpen},alert);
15-
}
16-
return{type:_types_1.ALERT_TOGGLE,payload:{alert:alert}};
4+
returnfunction(dispatch,getState){
5+
varisOpen=getState().alert.open;
6+
if(!alert){
7+
alert={
8+
action:'',
9+
message:'',
10+
open:false,
11+
};
12+
}
13+
else{
14+
alert=Object.assign({},{open:!isOpen},alert);
15+
}
16+
dispatch({type:_types_1.ALERT_TOGGLE,payload:{alert:alert}});
17+
};
1718
}
1819
exports.alertToggle=alertToggle;
1920
functionalertReplay(){

‎lib/actions/package.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
"use strict";
22
var_types_1=require('./_types');
3-
varstore_1=require('../store');
43
functionpackageSet(){
5-
vardir=store_1.default.getState().dir;
6-
return{type:_types_1.PACKAGE_SET,payload:{dir:dir}};
4+
returnfunction(dispatch,getState){
5+
vardir=getState().dir;
6+
dispatch({type:_types_1.PACKAGE_SET,payload:{dir:dir}});
7+
};
78
}
89
exports.packageSet=packageSet;

‎lib/actions/page.js

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,39 @@
11
"use strict";
22
vartest_1=require('./test');
33
var_types_1=require('./_types');
4-
varstore_1=require('../store');
54
functionpageNext(){
6-
var_a=store_1.default.getState(),pagePosition=_a.pagePosition,tutorial=_a.tutorial;
7-
varpages=tutorial.pages;
8-
if(pagePosition>=pages.length-1){
9-
return{type:_types_1.ROUTE_SET,payload:{route:'final'}};
10-
}
11-
else{
12-
pagePosition+=1;
13-
setTimeout(function(){returnstore_1.default.dispatch(test_1.testsLoad(pagePosition));});
14-
returnpageSet(pagePosition);
15-
}
5+
returnfunction(dispatch,getState){
6+
var_a=getState(),pagePosition=_a.pagePosition,tutorial=_a.tutorial;
7+
varpages=tutorial.pages;
8+
if(pagePosition>=pages.length-1){
9+
dispatch({type:_types_1.ROUTE_SET,payload:{route:'final'}});
10+
}
11+
else{
12+
pagePosition+=1;
13+
dispatch(pageSet(pagePosition));
14+
dispatch(test_1.testsLoad(pagePosition));
15+
}
16+
};
1617
}
1718
exports.pageNext=pageNext;
1819
functionpageSet(pagePosition){
1920
if(pagePosition===void0){pagePosition=0;}
20-
var_a=store_1.default.getState(),dir=_a.dir,progress=_a.progress,tutorial=_a.tutorial;
21-
if(pagePosition>=progress.pages.length){
22-
return{type:_types_1.ROUTE_SET,payload:{route:'final'}};
23-
}
24-
return{type:_types_1.PAGE_SET,payload:{dir:dir,pagePosition:pagePosition,tutorial:tutorial,progress:progress}};
21+
returnfunction(dispatch,getState){
22+
var_a=getState(),dir=_a.dir,progress=_a.progress,tutorial=_a.tutorial;
23+
if(pagePosition>=progress.pages.length){
24+
dispatch({type:_types_1.ROUTE_SET,payload:{route:'final'}});
25+
}
26+
dispatch({
27+
type:_types_1.PAGE_SET,payload:{dir:dir,pagePosition:pagePosition,tutorial:tutorial,progress:progress}
28+
});
29+
};
2530
}
2631
exports.pageSet=pageSet;
2732
functionpagePositionLoad(){
28-
varprogress=store_1.default.getState().progress;
29-
return{type:_types_1.PAGE_POSITION_LOAD,payload:{progress:progress}};
33+
returnfunction(dispatch,getState){
34+
varprogress=getState().progress;
35+
dispatch({type:_types_1.PAGE_POSITION_LOAD,payload:{progress:progress}});
36+
};
3037
}
3138
exports.pagePositionLoad=pagePositionLoad;
3239
functionpagePositionSet(pagePosition){

‎lib/actions/progress.js

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,28 @@
11
"use strict";
22
var_types_1=require('./_types');
33
varpage_1=require('./page');
4-
varstore_1=require('../store');
54
functionprogressLoad(){
6-
setTimeout(function(){returnstore_1.default.dispatch(page_1.pagePositionLoad());});
7-
vartutorial=store_1.default.getState().tutorial;
8-
return{type:_types_1.PROGRESS_LOAD,payload:{tutorial:tutorial}};
5+
returnfunction(dispatch,getState){
6+
vartutorial=getState().tutorial;
7+
dispatch({type:_types_1.PROGRESS_LOAD,payload:{tutorial:tutorial}});
8+
dispatch(page_1.pagePositionLoad());
9+
};
910
}
1011
exports.progressLoad=progressLoad;
1112
functioncompletePage(){
12-
var_a=store_1.default.getState(),pagePosition=_a.pagePosition,progress=_a.progress,tutorial=_a.tutorial;
13-
if(progress.pages.every(function(x){returnx.completed;})){
14-
store_1.default.dispatch(completeTutorial());
15-
}
16-
return{type:_types_1.COMPLETE_PAGE,payload:{pagePosition:pagePosition,tutorial:tutorial}};
13+
returnfunction(dispatch,getState){
14+
var_a=getState(),pagePosition=_a.pagePosition,progress=_a.progress,tutorial=_a.tutorial;
15+
if(progress.pages.every(function(x){returnx.completed;})){
16+
dispatch(completeTutorial());
17+
}
18+
dispatch({type:_types_1.COMPLETE_PAGE,payload:{pagePosition:pagePosition,tutorial:tutorial}});
19+
};
1720
}
1821
exports.completePage=completePage;
1922
functioncompleteTutorial(){
20-
vartutorial=store_1.default.getState().tutorial;
21-
return{type:_types_1.COMPLETE_TUTORIAL,payload:{tutorial:tutorial}};
23+
returnfunction(dispatch,getState){
24+
vartutorial=getState().tutorial;
25+
dispatch({type:_types_1.COMPLETE_TUTORIAL,payload:{tutorial:tutorial}});
26+
};
2227
}
2328
exports.completeTutorial=completeTutorial;

‎lib/actions/route.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
"use strict";
2-
varstore_1=require('../store');
32
var_types_1=require('./_types');
43
vartutorial_1=require('./tutorial');
54
varprevious=null;
65
functionrouteSet(route){
76
if(route&&route!==previous){
8-
switch(route){
9-
case'tutorials':
10-
store_1.default.dispatch(tutorial_1.tutorialsFind());
11-
}
12-
previous=route;
13-
return{type:_types_1.ROUTE_SET,payload:{route:route}};
7+
returnfunction(dispatch){
8+
switch(route){
9+
case'tutorials':
10+
dispatch(tutorial_1.tutorialsFind());
11+
}
12+
previous=route;
13+
dispatch({type:_types_1.ROUTE_SET,payload:{route:route}});
14+
};
1415
}
1516
}
1617
exports.routeSet=routeSet;

‎lib/actions/setup.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
"use strict";
22
var_types_1=require('./_types');
33
varpackage_1=require('./package');
4-
varstore_1=require('../store');
54
functionsetupVerify(){
6-
store_1.default.dispatch(package_1.packageSet());
7-
var_a=store_1.default.getState(),dir=_a.dir,packageJson=_a.packageJson;
8-
return{type:_types_1.SETUP_VERIFY,payload:{dir:dir,packageJson:packageJson}};
5+
returnfunction(dispatch,getState){
6+
dispatch(package_1.packageSet());
7+
var_a=getState(),dir=_a.dir,packageJson=_a.packageJson;
8+
dispatch({type:_types_1.SETUP_VERIFY,payload:{dir:dir,packageJson:packageJson}});
9+
};
910
}
1011
exports.setupVerify=setupVerify;

‎lib/actions/test.js

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
"use strict";
22
var_types_1=require('./_types');
3-
varstore_1=require('../store');
43
functiontestRun(){
5-
var_a=store_1.default.getState(),taskTests=_a.taskTests,dir=_a.dir,tutorial=_a.tutorial,taskPosition=_a.taskPosition;
6-
return{type:_types_1.TEST_RUN,payload:{taskTests:taskTests,dir:dir,tutorial:tutorial,taskPosition:taskPosition}};
4+
returnfunction(dispatch,getState){
5+
var_a=getState(),taskTests=_a.taskTests,dir=_a.dir,tutorial=_a.tutorial,taskPosition=_a.taskPosition;
6+
dispatch({
7+
type:_types_1.TEST_RUN,payload:{taskTests:taskTests,dir:dir,tutorial:tutorial,taskPosition:taskPosition}
8+
});
9+
};
710
}
811
exports.testRun=testRun;
912
functiontestResult(result){
10-
vartaskActions=store_1.default.getState().taskActions;
11-
return{type:_types_1.TEST_RESULT,payload:{result:result,taskActions:taskActions}};
13+
returnfunction(dispatch,getState){
14+
vartaskActions=getState().taskActions;
15+
dispatch({type:_types_1.TEST_RESULT,payload:{result:result,taskActions:taskActions}});
16+
};
1217
}
1318
exports.testResult=testResult;
1419
functiontestComplete(){
@@ -20,9 +25,13 @@ function testSave() {
2025
}
2126
exports.testSave=testSave;
2227
functiontestsLoad(pagePosition){
23-
var_a=store_1.default.getState(),tasks=_a.tasks,progress=_a.progress,tutorial=_a.tutorial,dir=_a.dir;
24-
return{type:_types_1.TESTS_LOAD,payload:{
25-
pagePosition:pagePosition,tasks:tasks,progress:progress,tutorial:tutorial,dir:dir
26-
}};
28+
returnfunction(dispatch,getState){
29+
var_a=getState(),tasks=_a.tasks,progress=_a.progress,tutorial=_a.tutorial,dir=_a.dir;
30+
dispatch({
31+
type:_types_1.TESTS_LOAD,payload:{
32+
pagePosition:pagePosition,tasks:tasks,progress:progress,tutorial:tutorial,dir:dir
33+
}
34+
});
35+
};
2736
}
2837
exports.testsLoad=testsLoad;

‎lib/actions/tutorial.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
"use strict";
22
var_types_1=require('./_types');
3-
varstore_1=require('../store');
43
functiontutorialSet(name){
5-
vardir=store_1.default.getState().dir;
6-
return{type:_types_1.TUTORIAL_SET,payload:{name:name,dir:dir}};
4+
returnfunction(dispatch,getState){
5+
vardir=getState().dir;
6+
dispatch({type:_types_1.TUTORIAL_SET,payload:{name:name,dir:dir}});
7+
};
78
}
89
exports.tutorialSet=tutorialSet;
910
functiontutorialUpdate(name){
1011
return{type:_types_1.TUTORIAL_UPDATE,payload:{name:name}};
1112
}
1213
exports.tutorialUpdate=tutorialUpdate;
1314
functiontutorialsFind(){
14-
var_a=store_1.default.getState(),packageJson=_a.packageJson,dir=_a.dir;
15-
return{type:_types_1.TUTORIALS_FIND,payload:{packageJson:packageJson,dir:dir}};
15+
returnfunction(dispatch,getState){
16+
var_a=getState(),packageJson=_a.packageJson,dir=_a.dir;
17+
dispatch({type:_types_1.TUTORIALS_FIND,payload:{packageJson:packageJson,dir:dir}});
18+
};
1619
}
1720
exports.tutorialsFind=tutorialsFind;

‎lib/reducers/checks/action-setup.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var editor_1 = require('../../atom/editor');
44
vareditor_2=require('../../atom/editor');
55
varactions_1=require('../../actions');
66
varstore_1=require('../../store');
7-
varpackageData="{\n \"name\": \"demo\",\n \"dependencies\": {\n \"coderoad-functional-school\": \"^0.2.1\"\n }\n}";
7+
varpackageData="{\n \"name\": \"demo\",\n \"dependencies\": {\n \"coderoad-functional-school\": \"^0.2.2\"\n }\n}";
88
functioncreatePackageJson(dir){
99
varpackagePath=path_1.join(dir,'package.json');
1010
returnnewPromise(function(resolve,reject){

‎lib/reducers/package-json/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ function packageJsonReducer(pj, action) {
77
if(pj===void0){pj=null;}
88
switch(action.type){
99
case_types_1.PACKAGE_SET:
10-
varpathToPackageJson=path_1.join(action.payload.dir,'package.json');
10+
vardir=action.payload.dir;
11+
varpathToPackageJson=path_1.join(dir,'package.json');
1112
if(exists_1.fileExists(pathToPackageJson)){
1213
returnJSON.parse(fs_1.readFileSync(pathToPackageJson,'utf8'));
1314
}

‎lib/store/index.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
"use strict";
22
varredux_1=require('redux');
33
varreducers_1=require('../reducers');
4+
varredux_thunk_1=require('redux-thunk');
45
varcreateLogger=require('redux-logger');
6+
varmiddlewares=[redux_thunk_1.default];
57
vardevMode=false;
6-
varstore=null;
78
if(devMode){
89
varlogger=createLogger();
9-
store=redux_1.createStore(reducers_1.default,redux_1.applyMiddleware(logger));
10-
}
11-
else{
12-
varinitialState={};
13-
store=redux_1.createStore(reducers_1.default,initialState);
10+
middlewares.push(logger);
1411
}
12+
varstore=redux_1.createStore(reducers_1.default,redux_1.applyMiddleware.apply(void0,middlewares));
1513
Object.defineProperty(exports,"__esModule",{value:true});
1614
exports.default=store;

‎package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@
4747
"react-redux":"4.4.5",
4848
"react-tap-event-plugin":"1.0.0",
4949
"redux":"3.5.2",
50-
"redux-logger":"2.6.1"
50+
"redux-logger":"2.6.1",
51+
"redux-thunk":"^2.0.1"
5152
},
5253
"scripts": {
5354
"compile":"tsc"

‎src/actions/alert.ts

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1-
importstorefrom'../store';
21
import{ALERT_TOGGLE,ALERT_REPLAY}from'./_types';
32

4-
exportfunctionalertToggle(alert?:CR.Alert):Action{
5-
constisOpen=store.getState().alert.open;
6-
if(!alert){
7-
alert={
8-
action:'',
9-
message:'',
10-
open:false,
11-
};
12-
}else{
13-
alert=Object.assign({},{open:!isOpen},alert);
14-
}
15-
return{type:ALERT_TOGGLE,payload:{ alert}};
3+
exportfunctionalertToggle(alert?:CR.Alert):ReduxThunk.ThunkInterface{
4+
return(dispatch,getState):void=>{
5+
constisOpen=getState().alert.open;
6+
if(!alert){
7+
alert={
8+
action:'',
9+
message:'',
10+
open:false,
11+
};
12+
}else{
13+
alert=Object.assign({},{open:!isOpen},alert);
14+
}
15+
dispatch({type:ALERT_TOGGLE,payload:{ alert}});
16+
};
1617
}
1718

1819
exportfunctionalertReplay():Action{

‎src/actions/package.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import{PACKAGE_SET}from'./_types';
2-
importstorefrom'../store';
32

4-
exportfunctionpackageSet():Action{
5-
const{dir}=store.getState();
6-
return{type:PACKAGE_SET,payload:{ dir}};
3+
exportfunctionpackageSet():ReduxThunk.ThunkInterface{
4+
return(dispatch,getState):void=>{
5+
const{dir}=getState();
6+
dispatch({type:PACKAGE_SET,payload:{ dir}});
7+
};
78
}

0 commit comments

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