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

Commit5758cf6

Browse files
committed
continue refactoring component names
2 parents99e0d12 +23d5040 commit5758cf6

29 files changed

+320
-250
lines changed

‎lib/actions/route.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
"use strict";
22
varstore_1=require('../store/store');
33
var_types_1=require('./_types');
4-
var_actions_1=require('./_actions');
4+
vartutorial_1=require('./tutorial');
55
varprevious=null;
66
functionsetRoute(route){
77
if(route&&route!==previous){
88
switch(route){
99
case'tutorials':
10-
store_1.store.dispatch(_actions_1.tutorialsFind());
10+
store_1.store.dispatch(tutorial_1.tutorialsFind());
1111
}
1212
previous=route;
1313
return{type:_types_1.ROUTE_SET,payload:{route:route}};

‎lib/components/page/toolbar/buttons.jsrenamed to‎lib/components/Page/PageToolbar/Continue.js

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
1616
varReact=require('react');
1717
varreact_redux_1=require('react-redux');
1818
varFlatButton_1=require('material-ui/FlatButton');
19-
varcode_1=require('material-ui/svg-icons/action/code');
20-
varactions_1=require('../../../atom/actions');
21-
vareditor_1=require('../../../atom/editor');
22-
varactions_2=require('../../../actions');
23-
exports.ToggleLog=function(){return(React.createElement(FlatButton_1.default,{icon:React.createElement(code_1.default,null),onTouchTap:actions_1.toggleDevTools}));};
24-
exports.Save=function(){return(React.createElement(FlatButton_1.default,{label:'Save',secondary:true,onTouchTap:editor_1.save}));};
19+
varactions_1=require('../../../actions');
2520
varContinue=(function(_super){
2621
__extends(Continue,_super);
2722
functionContinue(){
@@ -33,7 +28,7 @@ var Continue = (function (_super) {
3328
Continue=__decorate([
3429
react_redux_1.connect(null,function(dispatch,state){
3530
return{
36-
callNextPage:function(){returndispatch(actions_2.pageNext());}
31+
callNextPage:function(){returndispatch(actions_1.pageNext());}
3732
};
3833
}),
3934
__metadata('design:paramtypes',[])
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
"use strict";
2+
varReact=require('react');
3+
varFlatButton_1=require('material-ui/FlatButton');
4+
vareditor_1=require('../../../atom/editor');
5+
exports.Save=function(){return(React.createElement(FlatButton_1.default,{label:'Save',secondary:true,onTouchTap:editor_1.save}));};
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
"use strict";
2+
varReact=require('react');
3+
varcode_1=require('material-ui/svg-icons/action/code');
4+
varactions_1=require('../../../atom/actions');
5+
varFlatButton_1=require('material-ui/FlatButton');
6+
exports.ToggleLog=function(){return(React.createElement(FlatButton_1.default,{icon:React.createElement(code_1.default,null),onTouchTap:actions_1.toggleDevTools}));};
Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
"use strict";
22
varReact=require('react');
33
varToolbar_1=require('material-ui/Toolbar');
4-
varbuttons_1=require('./buttons');
4+
varToggleLog_1=require('./ToggleLog');
5+
varSave_1=require('./Save');
6+
varContinue_1=require('./Continue');
57
exports.PageToolbar=function(_a){
68
vartasks=_a.tasks,taskPosition=_a.taskPosition,children=_a.children;
7-
return(React.createElement("section",{className:'cr-page-toolbar'},children,React.createElement(Toolbar_1.Toolbar,null,React.createElement(Toolbar_1.ToolbarGroup,{float:'left'},React.createElement(buttons_1.ToggleLog,null)),React.createElement(Toolbar_1.ToolbarGroup,{float:'right'},taskPosition>=tasks.length ?
8-
React.createElement(buttons_1.Continue,null) :React.createElement(buttons_1.Save,null)))));
9+
return(React.createElement("section",{className:'cr-page-toolbar'},children,React.createElement(Toolbar_1.Toolbar,null,React.createElement(Toolbar_1.ToolbarGroup,{float:'left'},React.createElement(ToggleLog_1.ToggleLog,null)),React.createElement(Toolbar_1.ToolbarGroup,{float:'right'},taskPosition>=tasks.length ?
10+
React.createElement(Continue_1.Continue,null) :React.createElement(Save_1.Save,null)))));
911
};
Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
"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+
};
16+
varReact=require('react');
17+
varreact_redux_1=require('react-redux');
18+
varactions_1=require('../../actions');
19+
varclassnames=require('classnames');
20+
varList_1=require('material-ui/List');
21+
varcolors_1=require('material-ui/styles/colors');
22+
varcheck_box_1=require('material-ui/svg-icons/toggle/check-box');
23+
varplay_circle_filled_1=require('material-ui/svg-icons/av/play-circle-filled');
24+
varcheck_box_outline_blank_1=require('material-ui/svg-icons/toggle/check-box-outline-blank');
25+
varProgressPage=(function(_super){
26+
__extends(ProgressPage,_super);
27+
functionProgressPage(){
28+
_super.apply(this,arguments);
29+
}
30+
ProgressPage.prototype.getProgressIcon=function(completed,current){
31+
if(completed){
32+
returnReact.createElement(check_box_1.default,null);
33+
}
34+
elseif(current){
35+
returnReact.createElement(play_circle_filled_1.default,{color:colors_1.pink500});
36+
}
37+
else{
38+
returnReact.createElement(check_box_outline_blank_1.default,null);
39+
}
40+
};
41+
ProgressPage.prototype.canActivate=function(isActive,itemPosition,position){
42+
varearlierChapter=itemPosition.chapter<position.chapter;
43+
varcurrentChapter=itemPosition.chapter=position.chapter;
44+
varearlierOrCurrentPage=itemPosition.page<=position.page;
45+
if(isActive||earlierChapter||(currentChapter&&earlierOrCurrentPage)){
46+
returntrue;
47+
}
48+
else{
49+
returnnull;
50+
}
51+
};
52+
ProgressPage.prototype.render=function(){
53+
var_a=this.props,page=_a.page,itemPosition=_a.itemPosition,position=_a.position;
54+
varisActive=itemPosition.chapter===position.chapter&&itemPosition.page===position.page;
55+
returnReact.createElement(List_1.ListItem,{className:classnames({
56+
'page':true,
57+
'page-isDisabled':!this.canActivate(isActive,itemPosition,position)
58+
}),primaryText:(itemPosition.page+1)+". "+page.title,secondaryText:page.description,leftIcon:this.getProgressIcon(page.completed,isActive),onClick:this.canActivate(isActive,itemPosition,position) ?this.props.selectPage.bind(this,itemPosition) :null});
59+
};
60+
;
61+
ProgressPage=__decorate([
62+
react_redux_1.connect(null,function(dispatch){
63+
return{
64+
selectPage:function(position){
65+
dispatch(actions_1.pageSet(position));
66+
dispatch(actions_1.setRoute('page'));
67+
}
68+
};
69+
}),
70+
__metadata('design:paramtypes',[])
71+
],ProgressPage);
72+
returnProgressPage;
73+
}(React.Component));
74+
exports.ProgressPage=ProgressPage;
75+
;
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
"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+
};
16+
varReact=require('react');
17+
varreact_redux_1=require('react-redux');
18+
varFlatButton_1=require('material-ui/FlatButton');
19+
varactions_1=require('../../actions');
20+
varLoadTutorials=(function(_super){
21+
__extends(LoadTutorials,_super);
22+
functionLoadTutorials(){
23+
_super.apply(this,arguments);
24+
}
25+
LoadTutorials.prototype.render=function(){
26+
returnReact.createElement(FlatButton_1.default,{style:{margin:'0 90px'},label:'Check for Tutorials',secondary:true,onTouchTap:this.props.tutorialsFind});
27+
};
28+
LoadTutorials=__decorate([
29+
react_redux_1.connect(null,function(dispatch){
30+
return{
31+
tutorialsFind:function(){
32+
dispatch(actions_1.tutorialsFind());
33+
}
34+
};
35+
}),
36+
__metadata('design:paramtypes',[])
37+
],LoadTutorials);
38+
returnLoadTutorials;
39+
}(React.Component));
40+
exports.LoadTutorials=LoadTutorials;

‎lib/components/tutorials/buttons.jsrenamed to‎lib/components/Tutorials/SelectTutorial.js

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -17,51 +17,7 @@ var React = require('react');
1717
varreact_redux_1=require('react-redux');
1818
varFlatButton_1=require('material-ui/FlatButton');
1919
varactions_1=require('../../actions');
20-
varfile_upload_1=require('material-ui/svg-icons/file/file-upload');
2120
vartutorial_package_1=require('../../services/tutorial-package');
22-
varLoadTutorials=(function(_super){
23-
__extends(LoadTutorials,_super);
24-
functionLoadTutorials(){
25-
_super.apply(this,arguments);
26-
}
27-
LoadTutorials.prototype.render=function(){
28-
returnReact.createElement(FlatButton_1.default,{style:{margin:'0 90px'},label:'Check for Tutorials',secondary:true,onTouchTap:this.props.tutorialsFind});
29-
};
30-
LoadTutorials=__decorate([
31-
react_redux_1.connect(null,function(dispatch){
32-
return{
33-
tutorialsFind:function(){
34-
dispatch(actions_1.tutorialsFind());
35-
}
36-
};
37-
}),
38-
__metadata('design:paramtypes',[])
39-
],LoadTutorials);
40-
returnLoadTutorials;
41-
}(React.Component));
42-
exports.LoadTutorials=LoadTutorials;
43-
varUpdateTutorial=(function(_super){
44-
__extends(UpdateTutorial,_super);
45-
functionUpdateTutorial(){
46-
_super.apply(this,arguments);
47-
}
48-
UpdateTutorial.prototype.render=function(){
49-
var_a=this.props,name=_a.name,tutorialUpdate=_a.tutorialUpdate;
50-
returnReact.createElement(file_upload_1.default,{onClick:tutorialUpdate(name)});
51-
};
52-
UpdateTutorial=__decorate([
53-
react_redux_1.connect(null,function(dispatch){
54-
return{
55-
tutorialUpdate:function(name){
56-
dispatch(actions_1.tutorialUpdate(name));
57-
}
58-
};
59-
}),
60-
__metadata('design:paramtypes',[])
61-
],UpdateTutorial);
62-
returnUpdateTutorial;
63-
}(React.Component));
64-
exports.UpdateTutorial=UpdateTutorial;
6521
varSelectTutorial=(function(_super){
6622
__extends(SelectTutorial,_super);
6723
functionSelectTutorial(){
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
"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+
};
16+
varReact=require('react');
17+
varreact_redux_1=require('react-redux');
18+
varfile_upload_1=require('material-ui/svg-icons/file/file-upload');
19+
varactions_1=require('../../actions');
20+
varUpdateTutorial=(function(_super){
21+
__extends(UpdateTutorial,_super);
22+
functionUpdateTutorial(){
23+
_super.apply(this,arguments);
24+
}
25+
UpdateTutorial.prototype.render=function(){
26+
var_a=this.props,name=_a.name,tutorialUpdate=_a.tutorialUpdate;
27+
returnReact.createElement(file_upload_1.default,{onClick:tutorialUpdate(name)});
28+
};
29+
UpdateTutorial=__decorate([
30+
react_redux_1.connect(null,function(dispatch){
31+
return{
32+
tutorialUpdate:function(name){
33+
dispatch(actions_1.tutorialUpdate(name));
34+
}
35+
};
36+
}),
37+
__metadata('design:paramtypes',[])
38+
],UpdateTutorial);
39+
returnUpdateTutorial;
40+
}(React.Component));
41+
exports.UpdateTutorial=UpdateTutorial;

‎lib/components/page/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ var content_1 = require('./content');
1818
vartasks_1=require('./tasks/tasks');
1919
varhints_1=require('./hints/hints');
2020
varpage_complete_1=require('./complete/page-complete');
21-
vartoolbar_1=require('./toolbar/toolbar');
22-
varprogress_bar_1=require('./progress-bar');
21+
varPageToolbar_1=require('./PageToolbar');
22+
varProgressBar_1=require('./ProgressBar');
2323
varpageStyle={
2424
height:'100%',
2525
width:'100%'
@@ -36,7 +36,7 @@ var Page = (function (_super) {
3636
var_a=this.props,page=_a.page,taskPosition=_a.taskPosition,hintPosition=_a.hintPosition,tasks=_a.tasks,testRun=_a.testRun;
3737
vartask=taskPosition<=tasks.length ?tasks[taskPosition] :null;
3838
varallComplete=taskPosition>=tasks.length;
39-
return(React.createElement("section",{className:'cr-page'},React.createElement(content_1.PageContent,__assign({},this.props)),React.createElement(tasks_1.Tasks,__assign({},this.props)),React.createElement("div",{className:'listEnd',ref:'listEnd'}),React.createElement(page_complete_1.PageCompleteMessage,{page:page}),React.createElement(hints_1.Hints,{task:task,hintPosition:hintPosition}),React.createElement(toolbar_1.PageToolbar,__assign({},this.props),React.createElement(progress_bar_1.ProgressBar,{taskPosition:taskPosition,taskCount:tasks.length}))));
39+
return(React.createElement("section",{className:'cr-page'},React.createElement(content_1.PageContent,__assign({},this.props)),React.createElement(tasks_1.Tasks,__assign({},this.props)),React.createElement("div",{className:'listEnd',ref:'listEnd'}),React.createElement(page_complete_1.PageCompleteMessage,{page:page}),React.createElement(hints_1.Hints,{task:task,hintPosition:hintPosition}),React.createElement(PageToolbar_1.PageToolbar,__assign({},this.props),React.createElement(ProgressBar_1.ProgressBar,{taskPosition:taskPosition,taskCount:tasks.length}))));
4040
};
4141
returnPage;
4242
}(React.Component));

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp