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

Commit292c286

Browse files
committed
move route into route module
1 parente9b224e commit292c286

File tree

35 files changed

+191
-211
lines changed

35 files changed

+191
-211
lines changed

‎lib/actions/_types.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ exports.HINT_POSITION_SET = 'HINT_POSITION_SET';
66
exports.PAGE_SET='PAGE_SET';
77
exports.PROGRESS_LOAD='PROGRESS_LOAD';
88
exports.PROGRESS_PAGE_POSITION_LOAD='PROGRESS_PAGE_POSITION_LOAD';
9-
exports.ROUTE_SET='ROUTE_SET';
109
exports.TEST_SAVE='TEST_SAVE';
1110
exports.SETUP_PACKAGE='SETUP_PACKAGE';
1211
exports.SETUP_VERIFY='SETUP_VERIFY';

‎lib/actions/alert.js

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎lib/actions/index.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
"use strict";
2-
varactions_1=require('../modules/alert/actions');
3-
exports.alertOpen=actions_1.alertOpen;
4-
exports.alertClose=actions_1.alertClose;
5-
exports.alertReplay=actions_1.alertReplay;
62
varprogress_1=require('./progress');
73
exports.progressLoad=progress_1.progressLoad;
84
exports.completePage=progress_1.completePage;
@@ -13,8 +9,6 @@ exports.hintPositionSet = hint_1.hintPositionSet;
139
varpage_1=require('./page');
1410
exports.pageSet=page_1.pageSet;
1511
exports.pageNext=page_1.pageNext;
16-
varroute_1=require('./route');
17-
exports.routeSet=route_1.routeSet;
1812
varsetup_1=require('./setup');
1913
exports.setupVerify=setup_1.setupVerify;
2014
exports.setupPackage=setup_1.setupPackage;
@@ -29,3 +23,9 @@ exports.tutorialSet = tutorial_1.tutorialSet;
2923
exports.tutorialUpdate=tutorial_1.tutorialUpdate;
3024
vartoggle_1=require('./toggle');
3125
exports.devToolsToggle=toggle_1.devToolsToggle;
26+
varactions_1=require('../modules/alert/actions');
27+
exports.alertOpen=actions_1.alertOpen;
28+
exports.alertClose=actions_1.alertClose;
29+
exports.alertReplay=actions_1.alertReplay;
30+
varactions_2=require('../modules/route/actions');
31+
exports.routeSet=actions_2.routeSet;

‎lib/actions/page.js

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
"use strict";
22
var_types_1=require('./_types');
33
varhint_1=require('./hint');
4+
varactions_1=require('../modules/route/actions');
45
functionpageNext(){
56
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-
}
7+
varpagePosition=getState().pagePosition;
8+
dispatch(pageSet(pagePosition+1));
159
};
1610
}
1711
exports.pageNext=pageNext;
@@ -20,7 +14,7 @@ function pageSet(pagePosition) {
2014
returnfunction(dispatch,getState){
2115
var_a=getState(),dir=_a.dir,progress=_a.progress,tutorial=_a.tutorial,route=_a.route;
2216
if(pagePosition>=progress.pages.length){
23-
dispatch({type:_types_1.ROUTE_SET,payload:{route:'final'}});
17+
returndispatch(actions_1.routeSet('final'));
2418
}
2519
dispatch(hint_1.hintPositionSet(0));
2620
vartasks=tutorial.pages[pagePosition].tasks||[];

‎lib/actions/route.js

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎lib/actions/tutorial.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
"use strict";
22
var_types_1=require('./_types');
33
varprogress_1=require('./progress');
4-
varroute_1=require('./route');
5-
varactions_1=require('../modules/alert/actions');
4+
varactions_1=require('../modules/route/actions');
5+
varactions_2=require('../modules/alert/actions');
66
functiontutorialSet(name){
77
returnfunction(dispatch,getState){
88
vardir=getState().dir;
99
dispatch({type:_types_1.TUTORIAL_SET,payload:{name:name,dir:dir}});
1010
dispatch(progress_1.progressLoad());
11-
dispatch(route_1.routeSet('progress'));
11+
dispatch(actions_1.routeSet('progress'));
1212
};
1313
}
1414
exports.tutorialSet=tutorialSet;
@@ -20,7 +20,7 @@ function tutorialUpdate(name) {
2020
duration:3000,
2121
};
2222
dispatch({type:_types_1.TUTORIAL_UPDATE,payload:{name:name}});
23-
dispatch(actions_1.alertOpen(alert));
23+
dispatch(actions_2.alertOpen(alert));
2424
};
2525
}
2626
exports.tutorialUpdate=tutorialUpdate;

‎lib/components/AppMenu/CloseWindow.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
1515
};
1616
varReact=require('react');
1717
varreact_redux_1=require('react-redux');
18-
varactions_1=require('../../actions');
1918
varIconButton_1=require('material-ui/IconButton');
2019
varclose_1=require('material-ui/svg-icons/navigation/close');
2120
varCloseWindow=(function(_super){
@@ -29,7 +28,7 @@ var CloseWindow = (function (_super) {
2928
CloseWindow=__decorate([
3029
react_redux_1.connect(null,function(dispatch){
3130
return{
32-
windowToggle:function(){returndispatch(actions_1.windowToggle());}
31+
windowToggle:function(){returndispatch({type:'WINDOW_TOGGLE'});}
3332
};
3433
}),
3534
__metadata('design:paramtypes',[])

‎lib/components/Tutorials/SelectTutorial/index.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ var SelectTutorial = (function (_super) {
3939
SelectTutorial=__decorate([
4040
react_redux_1.connect(null,function(dispatch){
4141
return{
42-
selectTutorial:function(name){
43-
dispatch(actions_1.tutorialSet(name));
44-
},
42+
selectTutorial:function(name){returndispatch(actions_1.tutorialSet(name));}
4543
};
4644
}),
4745
__metadata('design:paramtypes',[])

‎lib/components/Tutorials/index.js

Lines changed: 42 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,54 @@
11
"use strict";
2+
var__extends=(this&&this.__extends)||function(d,b){
3+
for(varpinb)if(b.hasOwnProperty(p))d[p]=b[p];
4+
function__(){this.constructor=d;}
5+
d.prototype=b===null ?Object.create(b) :(__.prototype=b.prototype,new__());
6+
};
7+
var__decorate=(this&&this.__decorate)||function(decorators,target,key,desc){
8+
varc=arguments.length,r=c<3 ?target :desc===null ?desc=Object.getOwnPropertyDescriptor(target,key) :desc,d;
9+
if(typeofReflect==="object"&&typeofReflect.decorate==="function")r=Reflect.decorate(decorators,target,key,desc);
10+
elsefor(vari=decorators.length-1;i>=0;i--)if(d=decorators[i])r=(c<3 ?d(r) :c>3 ?d(target,key,r) :d(target,key))||r;
11+
returnc>3&&r&&Object.defineProperty(target,key,r),r;
12+
};
13+
var__metadata=(this&&this.__metadata)||function(k,v){
14+
if(typeofReflect==="object"&&typeofReflect.metadata==="function")returnReflect.metadata(k,v);
15+
};
216
varReact=require('react');
17+
varreact_redux_1=require('react-redux');
318
varTable_1=require('material-ui/Table');
419
varLoadTutorials_1=require('./LoadTutorials');
520
varUpdateTutorial_1=require('./UpdateTutorial');
621
varSelectTutorial_1=require('./SelectTutorial');
22+
varactions_1=require('../../actions');
723
varstyles={
824
padding:'10px',
925
textAlign:'center',
1026
};
11-
varTutorials=function(_a){
12-
vartutorialList=_a.tutorialList;
13-
return(React.createElement("div",{style:styles},React.createElement(Table_1.Table,null,React.createElement(Table_1.TableHeader,{displaySelectAll:false,adjustForCheckbox:false},React.createElement(Table_1.TableRow,null,React.createElement(Table_1.TableHeaderColumn,null,"Tutorial"),React.createElement(Table_1.TableHeaderColumn,null,"Version"))),React.createElement(Table_1.TableBody,{displayRowCheckbox:false},tutorialList.map(functiontutorialRow(tutorial,index){
14-
return(React.createElement(Table_1.TableRow,{key:index},React.createElement(Table_1.TableRowColumn,null,React.createElement(SelectTutorial_1.default,{tutorial:tutorial})),React.createElement(Table_1.TableRowColumn,null,tutorial.version,!!tutorial.latest
15-
?React.createElement(UpdateTutorial_1.default,{tutorial:tutorial})
16-
:null)));
17-
}))),React.createElement("br",null),React.createElement(LoadTutorials_1.default,null)));
18-
};
27+
varTutorials=(function(_super){
28+
__extends(Tutorials,_super);
29+
functionTutorials(props){
30+
_super.call(this,props);
31+
}
32+
Tutorials.prototype.componentDidMount=function(){
33+
this.props.loadTutorials();
34+
};
35+
Tutorials.prototype.render=function(){
36+
vartutorialList=this.props.tutorialList;
37+
return(React.createElement("div",{style:styles},React.createElement(Table_1.Table,null,React.createElement(Table_1.TableHeader,{displaySelectAll:false,adjustForCheckbox:false},React.createElement(Table_1.TableRow,null,React.createElement(Table_1.TableHeaderColumn,null,"Tutorial"),React.createElement(Table_1.TableHeaderColumn,null,"Version"))),React.createElement(Table_1.TableBody,{displayRowCheckbox:false},tutorialList.map(functiontutorialRow(tutorial,index){
38+
return(React.createElement(Table_1.TableRow,{key:index},React.createElement(Table_1.TableRowColumn,null,React.createElement(SelectTutorial_1.default,{tutorial:tutorial})),React.createElement(Table_1.TableRowColumn,null,tutorial.version,!!tutorial.latest
39+
?React.createElement(UpdateTutorial_1.default,{tutorial:tutorial})
40+
:null)));
41+
}))),React.createElement("br",null),React.createElement(LoadTutorials_1.default,null)));
42+
};
43+
Tutorials=__decorate([
44+
react_redux_1.connect(null,function(dispatch){
45+
return{
46+
loadTutorials:function(){returndispatch(actions_1.tutorialsFind());}
47+
};
48+
}),
49+
__metadata('design:paramtypes',[Object])
50+
],Tutorials);
51+
returnTutorials;
52+
}(React.Component));
1953
Object.defineProperty(exports,"__esModule",{value:true});
2054
exports.default=Tutorials;

‎lib/components/index.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
"use strict";
2-
varalert_1=require('../modules/alert');
3-
exports.Alert=alert_1.Alert;
42
varAppMenu_1=require('./AppMenu');
53
exports.AppMenu=AppMenu_1.default;
64
varFinalPage_1=require('./FinalPage');
@@ -17,7 +15,9 @@ var Tutorials_1 = require('./Tutorials');
1715
exports.Tutorials=Tutorials_1.default;
1816
varMarkdown_1=require('./common/Markdown');
1917
exports.Markdown=Markdown_1.default;
20-
varRouteButton_1=require('./common/RouteButton');
21-
exports.RouteButton=RouteButton_1.default;
2218
varContentCard_1=require('./common/ContentCard');
2319
exports.ContentCard=ContentCard_1.default;
20+
varalert_1=require('../modules/alert');
21+
exports.Alert=alert_1.Alert;
22+
varroute_1=require('../modules/route');
23+
exports.RouteButton=route_1.RouteButton;

‎lib/components/Alert/index.jsrenamed to‎lib/modules/route/RouteButton.js

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,26 @@ var __metadata = (this && this.__metadata) || function (k, v) {
1515
};
1616
varReact=require('react');
1717
varreact_redux_1=require('react-redux');
18-
varSnackbar_1=require('material-ui/Snackbar');
19-
varactions_1=require('../../actions');
20-
vardefaultAlert={
21-
message:'',
22-
open:false,
23-
};
24-
varAlert=(function(_super){
25-
__extends(Alert,_super);
26-
functionAlert(){
18+
varRaisedButton_1=require('material-ui/RaisedButton');
19+
varactions_1=require('./actions');
20+
varRouteButton=(function(_super){
21+
__extends(RouteButton,_super);
22+
functionRouteButton(){
2723
_super.apply(this,arguments);
2824
}
29-
Alert.prototype.render=function(){
30-
var_a=this.props,alert=_a.alert,close=_a.close;
31-
varaction=alert.action,message=alert.message,open=alert.open,duration=alert.duration;
32-
return(React.createElement(Snackbar_1.default,{className:"cr-alert "+action,open:open,message:message||'',action:action||'NOTE',autoHideDuration:duration||2000,onRequestClose:close}));
25+
RouteButton.prototype.render=function(){
26+
var_a=this.props,label=_a.label,route=_a.route,style=_a.style,routeTo=_a.routeTo;
27+
return(React.createElement(RaisedButton_1.default,{label:label,style:style||{},onTouchTap:routeTo.bind(this,route),secondary:true}));
3328
};
34-
Alert=__decorate([
29+
RouteButton=__decorate([
3530
react_redux_1.connect(null,function(dispatch){
3631
return{
37-
close:function(){returndispatch(actions_1.alertClose());}
32+
routeTo:function(route){returndispatch(actions_1.routeSet(route));}
3833
};
3934
}),
4035
__metadata('design:paramtypes',[])
41-
],Alert);
42-
returnAlert;
36+
],RouteButton);
37+
returnRouteButton;
4338
}(React.Component));
4439
Object.defineProperty(exports,"__esModule",{value:true});
45-
exports.default=Alert;
40+
exports.default=RouteButton;

‎lib/modules/route/actions.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
"use strict";
2+
vartypes_1=require('./types');
3+
varprevious=null;
4+
functionrouteSet(route){
5+
if(route&&route!==previous){
6+
returnfunction(dispatch){
7+
previous=route;
8+
dispatch({type:types_1.ROUTE_SET,payload:{route:route}});
9+
};
10+
}
11+
}
12+
exports.routeSet=routeSet;

‎lib/modules/route/index.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
"use strict";
2+
varRouteButton_1=require('./RouteButton');
3+
exports.RouteButton=RouteButton_1.default;
4+
varreducer_1=require('./reducer');
5+
exports.reducer=reducer_1.default;

‎lib/reducers/route/index.jsrenamed to‎lib/modules/route/reducer.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
"use strict";
2-
var_types_1=require('../../actions/_types');
2+
vartypes_1=require('./types');
33
var_route='start';
44
functionrouteReducer(route,action){
55
if(route===void0){route=_route;}
66
switch(action.type){
7-
case_types_1.ROUTE_SET:
7+
casetypes_1.ROUTE_SET:
88
returnaction.payload.route;
99
default:
1010
returnroute;

‎lib/modules/route/types.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
"use strict";
2+
exports.ROUTE_SET='ROUTE_SET';

‎lib/reducers/alert/index.js

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎lib/reducers/index.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
"use strict";
22
varredux_1=require('redux');
3-
varalert_1=require('../modules/alert');
4-
varwindow_1=require('../modules/window');
53
varchecks_1=require('./checks');
64
vardevTools_toggle_1=require('./devTools-toggle');
75
vardir_1=require('./dir');
@@ -10,18 +8,20 @@ var package_json_1 = require('./package-json');
108
varpage_1=require('./page');
119
varpage_position_1=require('./page-position');
1210
varprogress_1=require('./progress');
13-
varroute_1=require('./route');
1411
vartasks_1=require('./tasks');
1512
vartask_actions_1=require('./task-actions');
1613
vartask_position_1=require('./task-position');
1714
vartask_tests_1=require('./task-tests');
1815
vartest_run_1=require('./test-run');
1916
vartutorial_1=require('./tutorial');
2017
vartutorial_list_1=require('./tutorial-list');
18+
varalert_1=require('../modules/alert');
19+
varwindow_1=require('../modules/window');
20+
varroute_1=require('../modules/route');
2121
Object.defineProperty(exports,"__esModule",{value:true});
2222
exports.default=redux_1.combineReducers({
2323
alert:alert_1.reducer,checks:checks_1.default,devToolsToggle:devTools_toggle_1.default,dir:dir_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,tasks:tasks_1.default,
24+
packageJson:package_json_1.default,page:page_1.default,pagePosition:page_position_1.default,progress:progress_1.default,route:route_1.reducer,tasks:tasks_1.default,
2525
tutorial:tutorial_1.default,tutorialList:tutorial_list_1.default,
2626
taskActions:task_actions_1.default,taskPosition:task_position_1.default,taskTests:task_tests_1.default,testRun:test_run_1.default,windowToggle:window_1.reducer
2727
});

0 commit comments

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