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

Commit216a791

Browse files
committed
delete TESTS_LOAD, move functionality into PAGE_SET
1 parente37ff77 commit216a791

File tree

28 files changed

+38
-116
lines changed

28 files changed

+38
-116
lines changed

‎lib/actions/_types.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ exports.SETUP_VERIFY = 'SETUP_VERIFY';
1818
exports.TEST_COMPLETE='TEST_COMPLETE';
1919
exports.TEST_RESULT='TEST_RESULT';
2020
exports.TEST_RUN='TEST_RUN';
21-
exports.TESTS_LOAD='TESTS_LOAD';
2221
exports.TUTORIAL_SET='TUTORIAL_SET';
2322
exports.TUTORIAL_UPDATE='TUTORIAL_UPDATE';
2423
exports.TUTORIALS_FIND='TUTORIALS_FIND';

‎lib/reducers/tasks/config-task-tests.js‎renamed to ‎lib/actions/config-task-tests.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22
varpath_1=require('path');
3-
varsystem_1=require('../../services/system');
3+
varsystem_1=require('../services/system');
44
functionconfigTestString(dir,tutorial,config,name,testPath){
55
if(system_1.isWindows){
66
testPath=testPath.split('/').join('\\');

‎lib/actions/index.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ exports.testRun = test_1.testRun;
2323
exports.testComplete=test_1.testComplete;
2424
exports.testResult=test_1.testResult;
2525
exports.testSave=test_1.testSave;
26-
exports.testsLoad=test_1.testsLoad;
2726
vartutorial_1=require('./tutorial');
2827
exports.tutorialsFind=tutorial_1.tutorialsFind;
2928
exports.tutorialSet=tutorial_1.tutorialSet;

‎lib/actions/page.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
2-
vartest_1=require('./test');
32
var_types_1=require('./_types');
3+
varconfig_task_tests_1=require('./config-task-tests');
44
functionpageNext(){
55
returnfunction(dispatch,getState){
66
var_a=getState(),pagePosition=_a.pagePosition,tutorial=_a.tutorial;
@@ -11,7 +11,6 @@ function pageNext() {
1111
else{
1212
pagePosition+=1;
1313
dispatch(pageSet(pagePosition));
14-
dispatch(test_1.testsLoad(pagePosition));
1514
}
1615
};
1716
}
@@ -20,11 +19,12 @@ function pageSet(pagePosition) {
2019
if(pagePosition===void0){pagePosition=0;}
2120
returnfunction(dispatch,getState){
2221
var_a=getState(),dir=_a.dir,progress=_a.progress,tutorial=_a.tutorial;
22+
vartasks=config_task_tests_1.default(dir,tutorial,tutorial.pages[pagePosition].tasks||[]);
2323
if(pagePosition>=progress.pages.length){
2424
dispatch({type:_types_1.ROUTE_SET,payload:{route:'final'}});
2525
}
2626
dispatch({
27-
type:_types_1.PAGE_SET,payload:{dir:dir,pagePosition:pagePosition,tutorial:tutorial,progress:progress}
27+
type:_types_1.PAGE_SET,payload:{dir:dir,pagePosition:pagePosition,tutorial:tutorial,progress:progress,tasks:tasks}
2828
});
2929
};
3030
}

‎lib/actions/test.js‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,3 @@ function testSave() {
2424
return{type:_types_1.TEST_SAVE};
2525
}
2626
exports.testSave=testSave;
27-
functiontestsLoad(pagePosition){
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-
};
36-
}
37-
exports.testsLoad=testsLoad;

‎lib/components/Progress/ProgressPage/index.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ var ProgressPage = (function (_super) {
4141
return{
4242
selectPage:function(pagePosition){
4343
dispatch(actions_1.pageSet(pagePosition));
44-
dispatch(actions_1.testsLoad(pagePosition));
4544
dispatch(actions_1.routeSet('page'));
4645
}
4746
};

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
varpath_1=require('path');
33
vareditor_1=require('../../atom/editor');
44
vareditor_2=require('../../atom/editor');
5-
varactions_1=require('../../actions');
6-
varstore_1=require('../../store');
75
varpackageData="{\n \"name\": \"demo\",\n \"dependencies\": {\n \"coderoad-functional-school\": \"^0.2.2\"\n }\n}";
86
functioncreatePackageJson(dir){
97
varpackagePath=path_1.join(dir,'package.json');
@@ -12,7 +10,6 @@ function createPackageJson(dir) {
1210
setTimeout(function(){returnresolve();});
1311
}).then(function(){
1412
editor_1.set(packageData);
15-
store_1.default.dispatch(actions_1.setupVerify());
1613
});
1714
}
1815
exports.createPackageJson=createPackageJson;
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
"use strict";
22
varcommand_line_1=require('../../services/command-line');
3-
varstore_1=require('../../store');
4-
varactions_1=require('../../actions');
53
functionupdateNpm(){
64
command_line_1.default('npm','update -g npm')
75
.then(function(res){
8-
store_1.default.dispatch(actions_1.setupVerify());
96
});
107
}
118
exports.updateNpm=updateNpm;

‎lib/reducers/index.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ var tutorial_1 = require('./tutorial');
1919
vartutorial_list_1=require('./tutorial-list');
2020
varwindow_toggle_1=require('./window-toggle');
2121
Object.defineProperty(exports,"__esModule",{value:true});
22-
exports.default=redux_1.combineReducers({
23-
alert:alert_1.default,checks:checks_1.default,dir:dir_1.default,devToolsToggle:devTools_toggle_1.default,taskActions:task_actions_1.default,hintPosition:hint_position_1.default,page:page_1.default,
24-
packageJson:package_json_1.default,pagePosition:page_position_1.default,progress:progress_1.default,route:route_1.default,taskPosition:task_position_1.default,
22+
exports.default=redux_1.combineReducers(Object.assign({},{
23+
alert:alert_1.default,checks:checks_1.default,dir:dir_1.default,devToolsToggle:devTools_toggle_1.default,taskActions:task_actions_1.default,hintPosition:hint_position_1.default,
24+
packageJson:package_json_1.default,page:page_1.default,pagePosition:page_position_1.default,progress:progress_1.default,route:route_1.default,taskPosition:task_position_1.default,
2525
taskTests:task_tests_1.default,tasks:tasks_1.default,testRun:test_run_1.default,tutorial:tutorial_1.default,tutorialList:tutorial_list_1.default,windowToggle:window_toggle_1.default
26-
});
26+
}));

‎lib/reducers/page/index.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
"use strict";
22
var_types_1=require('../../actions/_types');
3-
vareditor_1=require('../../atom/editor');
43
var_page={
54
title:'',
65
description:'',
@@ -12,7 +11,6 @@ function pageReducer(p, action) {
1211
case_types_1.PAGE_SET:
1312
var_a=action.payload,pagePosition=_a.pagePosition,tutorial=_a.tutorial;
1413
var_b=tutorial.pages[pagePosition],title=_b.title,description=_b.description,onPageComplete=_b.onPageComplete,completed=_b.completed;
15-
editor_1.clearConsole();
1614
return{
1715
title:title,
1816
description:description,

0 commit comments

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