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

Commitf0b308d

Browse files
committed
fix taskTracker, adjust reducer spacing
1 parentd05c6ac commitf0b308d

File tree

24 files changed

+149
-73
lines changed

24 files changed

+149
-73
lines changed

‎lib/components/App.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ var App = (function (_super) {
3636
}
3737
App.prototype.render=function(){
3838
varstore=this.props.store;
39-
console.log(store);
4039
return(React.createElement("section",{className:'cr',key:'main',style:{height:height}},React.createElement(index_1.AppMenu,__assign({},store)),React.createElement(Routes_1.Routes,__assign({},store)),React.createElement(index_1.Alert,__assign({},store))));
4140
};
4241
App=__decorate([

‎lib/reducers/alert/index.js

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,30 +30,31 @@ function alertReducer(alert, action) {
3030
});
3131
case_types_1.TEST_RESULT:
3232
varresult=action.payload.result;
33-
if(result.pass&&result.change>0){
34-
statusBarAlert.style.color='#73C990';
35-
returnsetAlert({
36-
message:result.msg,
37-
duration:result.duration||1500,
38-
});
33+
switch(true){
34+
caseresult.pass&&result.change>0:
35+
statusBarAlert.style.color='#73C990';
36+
returnsetAlert({
37+
message:result.msg,
38+
duration:result.duration||1500,
39+
});
40+
caseresult.pass===false&&result.change<1:
41+
statusBarAlert.style.color='#FF4081';
42+
returnsetAlert({
43+
message:result.msg,
44+
action:'fail',
45+
duration:result.duration||2500,
46+
});
47+
default:
48+
statusBarAlert.style.color='#9DA5B4';
3949
}
40-
elseif(result.pass===false&&result.change<1){
41-
statusBarAlert.style.color='#FF4081';
42-
returnsetAlert({
43-
message:result.msg,
44-
action:'fail',
45-
duration:result.duration||2500,
46-
});
47-
}
48-
statusBarAlert.style.color='#9DA5B4';
4950
returnsetAlert({
5051
message:result.msg,
5152
action:'note',
5253
duration:result.duration||2500,
5354
});
5455
case_types_1.COMPLETE_PAGE:
5556
returnsetAlert({
56-
message:"Page "+(action.payload.pagePosition.page+1)+" Complete",
57+
message:"Page "+(action.payload.pagePosition+1)+" Complete",
5758
});
5859
case_types_1.COMPLETE_TUTORIAL:
5960
returnsetAlert({

‎lib/reducers/editor-actions/index.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,25 @@ function handleEditorActions(actions) {
1010
},Promise.resolve());
1111
}
1212
}
13-
varcurrentTaskPosition=0;
13+
vartaskTracker=0;
1414
functioneditorActionsReducer(editorActions,action){
1515
if(editorActions===void0){editorActions=[];}
1616
varactions=null;
1717
switch(action.type){
1818
case_types_1.TESTS_LOAD:
19+
taskTracker=0;
1920
actions=store_1.default.getState().tasks.map(function(task){returntask.actions||[];});
2021
handleEditorActions(actions);
2122
returnactions;
2223
case_types_1.TEST_RESULT:
2324
actions=action.payload.actions||[];
2425
varnextTaskPosition=action.payload.result.taskPosition;
25-
vartimes=nextTaskPosition-currentTaskPosition;
26+
vartimes=nextTaskPosition-taskTracker;
2627
if(times>0){
2728
for(vari=0;i<times;i++){
2829
handleEditorActions(actions);
2930
}
30-
currentTaskPosition=nextTaskPosition;
31+
taskTracker=nextTaskPosition;
3132
}
3233
returnactions;
3334
default:

‎lib/reducers/test-run/test-result.js

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@ var store_1 = require('../../store');
33
varactions_1=require('../../actions');
44
functionhandleResult(result){
55
store_1.default.dispatch(actions_1.testComplete());
6-
if(result.completed){
7-
store_1.default.dispatch(actions_1.testResult(result));
8-
store_1.default.dispatch(actions_1.completePage());
9-
}
10-
elseif(!result.pass){
11-
store_1.default.dispatch(actions_1.testResult(result));
12-
}
13-
elseif(result.pass){
14-
result.msg="Task "+result.taskPosition+" Complete";
15-
store_1.default.dispatch(actions_1.testResult(result));
6+
switch(true){
7+
caseresult.completed:
8+
store_1.default.dispatch(actions_1.testResult(result));
9+
store_1.default.dispatch(actions_1.completePage());
10+
break;
11+
case!result.pass:
12+
store_1.default.dispatch(actions_1.testResult(result));
13+
break;
14+
caseresult.pass:
15+
result.msg="Task "+result.taskPosition+" Complete";
16+
store_1.default.dispatch(actions_1.testResult(result));
17+
break;
1618
}
1719
}
1820
exports.handleResult=handleResult;

‎lib/store/index.js

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
11
"use strict";
22
varredux_1=require('redux');
33
varreducers_1=require('../reducers');
4-
varinitialState={};
5-
varstore=redux_1.createStore(reducers_1.default,initialState);
4+
varcreateLogger=require('redux-logger');
5+
vardev=false;
6+
varstore=null;
7+
if(dev){
8+
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);
14+
}
615
Object.defineProperty(exports,"__esModule",{value:true});
716
exports.default=store;

‎package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@
4545
"react-dom":"15.0.2",
4646
"react-redux":"4.4.5",
4747
"react-tap-event-plugin":"1.0.0",
48-
"redux":"3.5.2"
48+
"redux":"3.5.2",
49+
"redux-logger":"2.6.1"
4950
},
5051
"scripts": {
5152
"test":"ava src/**/*.spec.js",

‎src/components/App.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ window.onresize = function() {
1414
exportclassAppextendsReact.Component<{store?:CR.State},{}>{
1515
render():React.ReactElement<{}>{
1616
conststore=this.props.store;
17-
console.log(store);
1817
return(
1918
<section
2019
className='cr'

‎src/reducers/alert/index.ts

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,49 +26,59 @@ export default function alertReducer(
2626
):CR.Alert{
2727
letstatusBarAlert=<HTMLElement>document.getElementsByClassName('cr-alert-replay')[0];
2828
switch(action.type){
29+
2930
caseALERT_REPLAY:
3031
returnsetAlert(current);
32+
3133
caseALERT_TOGGLE:
3234
returnaction.payload.alert||_alert;
35+
3336
caseTUTORIAL_UPDATE:
3437
returnsetAlert({
3538
message:`run \`npm install --save-dev${action.payload.name}\``,
3639
action:'note',
3740
duration:4000,
3841
});
42+
3943
caseTEST_RESULT:
40-
letresult=action.payload.result;
41-
if(result.pass&&result.change>0){
42-
// Pass
43-
statusBarAlert.style.color='#73C990';
44-
returnsetAlert({
45-
message:result.msg,
46-
duration:result.duration||1500,
47-
});
48-
}elseif(result.pass===false&&result.change<1){
44+
constresult=action.payload.result;
45+
46+
switch(true){
47+
// pass
48+
caseresult.pass&&result.change>0:
49+
statusBarAlert.style.color='#73C990';
50+
returnsetAlert({
51+
message:result.msg,
52+
duration:result.duration||1500,
53+
});
4954
// Fail
50-
statusBarAlert.style.color='#FF4081';
51-
returnsetAlert({
52-
message:result.msg,
53-
action:'fail',
54-
duration:result.duration||2500,
55-
});
55+
caseresult.pass===false&&result.change<1:
56+
statusBarAlert.style.color='#FF4081';
57+
returnsetAlert({
58+
message:result.msg,
59+
action:'fail',
60+
duration:result.duration||2500,
61+
});
62+
// Alert
63+
default:
64+
statusBarAlert.style.color='#9DA5B4';
5665
}
57-
// Alert
58-
statusBarAlert.style.color='#9DA5B4';
5966
returnsetAlert({
6067
message:result.msg,
6168
action:'note',
6269
duration:result.duration||2500,
6370
});
71+
6472
caseCOMPLETE_PAGE:
6573
returnsetAlert({
66-
message:`Page${action.payload.pagePosition.page+1} Complete`,
74+
message:`Page${action.payload.pagePosition+1} Complete`,
6775
});
76+
6877
caseCOMPLETE_TUTORIAL:
6978
returnsetAlert({
7079
message:'Tutorial Complete',
7180
});
81+
7282
default:
7383
returnalert;
7484
}

‎src/reducers/checks/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ export default function checksReducer(
1818
checks=_checks,action:Action
1919
):CR.Checks{
2020
switch(action.type){
21+
2122
caseSETUP_VERIFY:
2223
returnsetupVerify();
24+
2325
default:
2426
returnchecks;
2527
}

‎src/reducers/editor-actions/index.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,31 @@ function handleEditorActions(actions: string[][]): void {
1313
}
1414

1515
// trigger actions only once, moving fowards
16-
letcurrentTaskPosition=0;
16+
lettaskTracker=0;
1717

1818
exportdefaultfunctioneditorActionsReducer(
1919
editorActions=[],action:Action
2020
):string[][]{
2121
letactions:string[][]=null;
2222
switch(action.type){
23+
2324
caseTESTS_LOAD:
25+
taskTracker=0;
2426
actions=store.getState().tasks.map(task=>task.actions||[]);
2527
handleEditorActions(actions);// run first action
2628
returnactions;
2729

2830
caseTEST_RESULT:
2931
actions=action.payload.actions||[];
30-
constnextTaskPosition:number=action.payload.result.taskPosition;
31-
consttimes:number=nextTaskPosition-currentTaskPosition;
32+
constnextTaskPosition=action.payload.result.taskPosition;
33+
consttimes:number=nextTaskPosition-taskTracker;
34+
3235
if(times>0){
3336
// run actions for each task position passed
3437
for(leti=0;i<times;i++){
3538
handleEditorActions(actions);// run first action
3639
}
37-
currentTaskPosition=nextTaskPosition;
40+
taskTracker=nextTaskPosition;
3841
}
3942
returnactions;
4043

‎src/reducers/hint-position/index.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,19 @@ export default function hintPositionReducer(
66
hintPosition=0,action:Action
77
):number{
88
switch(action.type){
9+
910
casePAGE_SET:
1011
return0;
12+
1113
caseTEST_RESULT:
1214
if(action.payload.result.change!==0){
1315
return0;
1416
}
1517
returnhintPosition;
18+
1619
caseHINT_POSITION_SET:
1720
returnaction.payload.hintPosition;
21+
1822
default:
1923
returnhintPosition;
2024
}

‎src/reducers/package-json/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@ export default function packageJsonReducer(
88
pj=null,action:Action
99
):PackageJson{
1010
switch(action.type){
11+
1112
casePACKAGE_SET:
1213
constdir=store.getState().dir;
1314
constpathToPackageJson=join(dir,'package.json');
1415
if(fileExists(pathToPackageJson)){
1516
returnJSON.parse(readFileSync(pathToPackageJson,'utf8'));
1617
}
1718
returnnull;
19+
1820
default:
1921
returnpj;
2022
}

‎src/reducers/page-position/index.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,16 @@ export default function pagePositionReducer(
77
pagePosition=0,action:Action
88
):CR.PagePosition{
99
switch(action.type){
10+
1011
casePAGE_POSITION_LOAD:
1112
constpages=store.getState().progress.pages;
1213
constfirstFail=pages.indexOf(x=>!x);
1314
returnfirstFail>0 ?firstFail :pages.length-1;
15+
1416
casePAGE_SET:
1517
casePAGE_POSITION_SET:
1618
returnaction.payload.pagePosition;
19+
1720
default:
1821
returnpagePosition;
1922
}

‎src/reducers/page/index.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ export default function pageReducer(
1212
p=_page,action:Action
1313
):CR.Page{
1414
switch(action.type){
15+
1516
casePAGE_SET:
1617
constpagePosition:CR.PagePosition=action.payload.pagePosition;
1718
const{title, description, onPageComplete, completed}=store.getState().tutorial.pages[pagePosition];
@@ -23,8 +24,10 @@ export default function pageReducer(
2324
onPageComplete,
2425
completed:completed||false
2526
};
27+
2628
caseCOMPLETE_PAGE:
2729
returnObject.assign({},p,{completed:true});
30+
2831
default:
2932
returnp;
3033
}

‎src/reducers/progress/index.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ export default function progressReducer(
1313
progress=_progress,action:Action
1414
):CR.Progress{
1515
switch(action.type){
16+
1617
casePROGRESS_LOAD:
1718
// load saved progress
1819
constsaved=loadProgressFromLocalStorage();
@@ -22,15 +23,18 @@ export default function progressReducer(
2223
completed:false,
2324
pages:store.getState().tutorial.pages.map(()=>false)
2425
};
26+
2527
caseCOMPLETE_PAGE:
2628
constpagePosition=action.payload.pagePosition;
2729
progress.pages[pagePosition]=true;
2830
saveToLocalStorage(progress);
2931
returnprogress;
32+
3033
caseCOMPLETE_TUTORIAL:
3134
progress.completed=true;
3235
saveToLocalStorage(progress);
3336
returnprogress;
37+
3438
default:
3539
returnprogress;
3640
}

‎src/reducers/route/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ export default function routeReducer(
77
route=_route,action:Action
88
):string{
99
switch(action.type){
10+
1011
caseROUTE_SET:
1112
returnaction.payload.route;
13+
1214
default:
1315
returnroute;
1416
}

‎src/reducers/task-position/index.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@ export default function taskPositionReducer(
44
taskPosition=0,action:Action
55
):number{
66
switch(action.type){
7+
78
casePAGE_SET:
89
return0;
10+
911
caseTEST_RESULT:
1012
returnaction.payload.result.taskPosition;
13+
1114
default:
1215
returntaskPosition;
1316
}

0 commit comments

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