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

Commit93881b5

Browse files
committed
refactor jsx based on AirBnB style guide
1 parent275d8c8 commit93881b5

File tree

32 files changed

+268
-141
lines changed

32 files changed

+268
-141
lines changed

‎lib/components/AppMenu/MenuLink.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var MenuLink = (function (_super) {
2424
}
2525
MenuLink.prototype.render=function(){
2626
var_a=this.props,route=_a.route,title=_a.title,routeTo=_a.routeTo;
27-
returnReact.createElement(MenuItem_1.default,{primaryText:title ?title :route,onTouchTap:routeTo.bind(this,route),key:route});
27+
return(React.createElement(MenuItem_1.default,{primaryText:title ?title :route,onTouchTap:routeTo.bind(this,route),key:route}));
2828
};
2929
MenuLink=__decorate([
3030
react_redux_1.connect(null,function(dispatch){

‎lib/components/AppMenu/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ var AppMenu = (function (_super) {
4040
case'page':
4141
returnReact.createElement(MenuLink_1.MenuLink,{route:'progress'});
4242
case'progress':
43-
returnReact.createElement(MenuItem_1.default,{onTouchTap:routeToPage,primaryText:'page',key:'page'});
43+
return(React.createElement(MenuItem_1.default,{onTouchTap:routeToPage,primaryText:'page',key:'page'}));
4444
default:returnnull;
4545
}
4646
};
@@ -59,9 +59,9 @@ var AppMenu = (function (_super) {
5959
};
6060
AppMenu.prototype.render=function(){
6161
varquit=this.props.quit;
62-
returnReact.createElement(AppBar_1.default,{title:'CodeRoad',className:'cr-menu-bar',iconElementLeft:React.createElement(IconButton_1.default,{onClick:this.closePanel},React.createElement(close_1.default,null)),iconElementRight:React.createElement(IconMenu_1.default,{iconButtonElement:React.createElement(IconButton_1.default,null,React.createElement(more_vert_1.default,null)),targetOrigin:origin,anchorOrigin:origin},this.menuOptions(),window.coderoad.issuesPath
62+
return(React.createElement(AppBar_1.default,{title:'CodeRoad',className:'cr-menu-bar',iconElementLeft:React.createElement(IconButton_1.default,{onClick:this.closePanel},React.createElement(close_1.default,null)),iconElementRight:React.createElement(IconMenu_1.default,{iconButtonElement:React.createElement(IconButton_1.default,null,React.createElement(more_vert_1.default,null)),targetOrigin:origin,anchorOrigin:origin},this.menuOptions(),window.coderoad.issuesPath
6363
?React.createElement(MenuItem_1.default,{key:'issue',className:'link'},React.createElement("a",{href:window.coderoad.issuesPath},"post issue"))
64-
:null,React.createElement(Divider_1.default,null),React.createElement(MenuItem_1.default,{key:'quit',onClick:quit},"quit"))});
64+
:null,React.createElement(Divider_1.default,null),React.createElement(MenuItem_1.default,{key:'quit',onClick:quit},"quit"))}));
6565
};
6666
AppMenu=__decorate([
6767
react_redux_1.connect(null,function(dispatch){

‎lib/components/FinalPage/index.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎lib/components/Page/EditPage.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ exports.EditPage = function (_a) {
77
vareditPath=_a.editPath;
88
if(editPath&&window.coderoad.edit){
99
varrepoPath=path.join(window.coderoad.repo,'edit','master',editPath);
10-
returnReact.createElement("a",{href:repoPath},React.createElement(mode_edit_1.default,{style:editStyle}));
10+
return(React.createElement("a",{href:repoPath},React.createElement(mode_edit_1.default,{style:editStyle})));
1111
}
1212
};

‎lib/components/Page/PageComplete/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var List_1 = require('material-ui/List');
44
varindex_1=require('../../index');
55
exports.PageCompleteMessage=function(_a){
66
varpage=_a.page;
7-
return(React.createElement("div",{className:'cr-page-onComplete'},page.completed&&page.onPageComplete ?
8-
React.createElement(List_1.ListItem,{key:'page-complete'},React.createElement(index_1.Markdown,null,page.onPageComplete))
7+
return(React.createElement("div",{className:'cr-page-onComplete'},page.completed&&page.onPageComplete
8+
?React.createElement(List_1.ListItem,{key:'page-complete'},React.createElement(index_1.Markdown,null,page.onPageComplete))
99
:null));
1010
};

‎lib/components/Page/PageToolbar/Continue.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ var Continue = (function (_super) {
2323
_super.apply(this,arguments);
2424
}
2525
Continue.prototype.render=function(){
26-
returnReact.createElement(FlatButton_1.default,{label:'Continue',primary:true,onTouchTap:this.props.callNextPage});
26+
return(React.createElement(FlatButton_1.default,{label:'Continue',primary:true,onTouchTap:this.props.callNextPage}));
2727
};
2828
Continue=__decorate([
2929
react_redux_1.connect(null,function(dispatch,state){

‎lib/components/Page/ProgressBar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ var LinearProgress_1 = require('material-ui/LinearProgress');
44
exports.ProgressBar=function(_a){
55
vartaskPosition=_a.taskPosition,taskCount=_a.taskCount;
66
varprogress=(taskPosition/taskCount)*100;
7-
returnReact.createElement(LinearProgress_1.default,{mode:'determinate',value:progress,style:{height:'10px'}});
7+
return(React.createElement(LinearProgress_1.default,{mode:'determinate',value:progress,style:{height:'10px'}}));
88
};

‎lib/components/Page/hints/HintButton.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ var HintButton = (function (_super) {
2626
var_a=this.props,hintPosition=_a.hintPosition,hintsLength=_a.hintsLength,label=_a.label,type=_a.type,hintSet=_a.hintSet;
2727
switch(type){
2828
case'next':
29-
returnReact.createElement(FlatButton_1.default,{label:label,disabled:hintPosition>hintsLength-2,onTouchTap:hintSet.bind(this,hintPosition+1)});
29+
return(React.createElement(FlatButton_1.default,{label:label,disabled:hintPosition>hintsLength-2,onTouchTap:hintSet.bind(this,hintPosition+1)}));
3030
case'prev':
31-
returnReact.createElement(FlatButton_1.default,{label:label,disabled:hintPosition===0,onTouchTap:hintSet.bind(this,hintPosition-1)});
31+
return(React.createElement(FlatButton_1.default,{label:label,disabled:hintPosition===0,onTouchTap:hintSet.bind(this,hintPosition-1)}));
3232
}
3333
};
3434
HintButton=__decorate([

‎lib/components/Page/hints/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ exports.Hints = function (_a) {
1111
returnnull;
1212
}
1313
varhint=hints[hintPosition];
14-
return(React.createElement(Card_1.Card,{className:'cr-task-hints'},React.createElement(Card_1.CardHeader,{title:'Hints',avatar:React.createElement(help_1.default,null),actAsExpander:true,showExpandableButton:true}),React.createElement(Card_1.CardText,{className:'cr-task-hint',expandable:true},React.createElement(index_1.Markdown,null,hint)),React.createElement(Card_1.CardActions,{expandable:true,className:'cr-task-hints-actions'},React.createElement(HintButton_1.HintButton,{label:'Previous',hintPosition:hintPosition,hintsLength:hints.length,type:'prev'}),React.createElement(HintButton_1.HintButton,{label:'Next',hintPosition:hintPosition,hintsLength:hints.length,type:'next'}))));
14+
return(React.createElement(Card_1.Card,{className:'cr-task-hints'},React.createElement(Card_1.CardHeader,{title:'Hints',avatar:React.createElement(help_1.default,null),actAsExpander:true,showExpandableButton:true}),React.createElement(Card_1.CardText,{className:'cr-task-hint',expandable:true},React.createElement(index_1.Markdown,null,hint)),React.createElement(Card_1.CardActions,{expandable:true,className:'cr-task-hints-actions'},React.createElement(HintButton_1.HintButton,{type:'prev',label:'Previous',hintPosition:hintPosition,hintsLength:hints.length}),React.createElement(HintButton_1.HintButton,{type:'next',label:'Next',hintPosition:hintPosition,hintsLength:hints.length}))));
1515
};

‎lib/components/Page/tasks/index.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
"use strict";
2+
var__assign=(this&&this.__assign)||Object.assign||function(t){
3+
for(vars,i=1,n=arguments.length;i<n;i++){
4+
s=arguments[i];
5+
for(varpins)if(Object.prototype.hasOwnProperty.call(s,p))
6+
t[p]=s[p];
7+
}
8+
returnt;
9+
};
10+
var_this=this;
211
varReact=require('react');
312
varList_1=require('material-ui/List');
413
varCard_1=require('material-ui/Card');
@@ -10,5 +19,5 @@ function visibleTasks(tasks, taskPosition) {
1019
exports.Tasks=function(_a){
1120
vartasks=_a.tasks,taskPosition=_a.taskPosition,testRun=_a.testRun;
1221
varvisTasks=visibleTasks(tasks,taskPosition);
13-
returnReact.createElement(Card_1.Card,{className:'cr-tasks'},React.createElement(List_1.List,null,React.createElement(Subheader_1.default,null,"Tasks"),visTasks.map(function(task,index){returnReact.createElement(Task_1.Task,{key:index,index:index,task:task,taskPosition:taskPosition,testRun:testRun});})));
22+
return(React.createElement(Card_1.Card,{className:'cr-tasks'},React.createElement(List_1.List,null,React.createElement(Subheader_1.default,null,"Tasks"),visTasks.map(function(task,index){return(React.createElement(Task_1.Task,__assign({key:index,index:index,task:task},_this.props)));}))));
1423
};

‎lib/components/Progress/ProgressPage.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,12 @@ var ProgressPage = (function (_super) {
5252
ProgressPage.prototype.render=function(){
5353
var_a=this.props,page=_a.page,itemPosition=_a.itemPosition,position=_a.position;
5454
varisActive=itemPosition.chapter===position.chapter&&itemPosition.page===position.page;
55-
returnReact.createElement(List_1.ListItem,{className:classnames({
55+
return(React.createElement(List_1.ListItem,{className:classnames({
5656
'page':true,
5757
'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});
58+
}),primaryText:(itemPosition.page+1)+". "+page.title,secondaryText:page.description,leftIcon:this.getProgressIcon(page.completed,isActive),onClick:this.canActivate(isActive,itemPosition,position)
59+
?this.props.selectPage.bind(this,itemPosition)
60+
:null}));
5961
};
6062
;
6163
ProgressPage=__decorate([

‎lib/components/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ var App = (function (_super) {
3535
_super.apply(this,arguments);
3636
}
3737
App.prototype.render=function(){
38-
return(React.createElement("section",{className:'cr',key:'main',style:{height:height}},React.createElement(index_1.AppMenu,__assign({},this.props.store)),React.createElement(Routes_1.Routes,__assign({},this.props.store,{ref:'route'})),React.createElement(index_1.Alert,__assign({},this.props.store))));
38+
return(React.createElement("section",{className:'cr',key:'main',style:{height:height}},React.createElement(index_1.AppMenu,__assign({},this.props.store)),React.createElement(Routes_1.Routes,__assign({},this.props.store)),React.createElement(index_1.Alert,__assign({},this.props.store))));
3939
};
4040
App=__decorate([
4141
react_redux_1.connect(function(store){

‎lib/components/progress/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ exports.Progress = function (_a) {
1515
varprogress=_a.progress,position=_a.position;
1616
return(React.createElement(Paper_1.default,{style:style,zDepth:1,className:'cr-progress'},React.createElement(List_1.List,null,React.createElement(Subheader_1.default,null,"Progress"),progress.chapters.map(function(chapter,chapterIndex){
1717
varisActive=chapterIndex===position.chapter;
18-
returnReact.createElement(List_1.ListItem,{key:'c'+chapterIndex,className:classnames({
18+
return(React.createElement(List_1.ListItem,{key:'c'+chapterIndex,className:classnames({
1919
'chapter':true,
2020
'isActive':isActive
2121
}),initiallyOpen:chapterIndex===0,leftIcon:chapter.completed ?React.createElement(check_box_1.default,null) :null,primaryTogglesNestedList:chapterIndex===position.chapter&&!chapter.completed,nestedItems:chapter.pages.map(function(page,pageIndex){
2222
varitemPosition={chapter:chapterIndex,page:pageIndex};
23-
returnReact.createElement(ProgressPage_1.ProgressPage,{key:'c'+chapterIndex+'p'+pageIndex,page:page,itemPosition:itemPosition,position:position});
24-
})},React.createElement("h3",null,chapterIndex+1,". ",chapter.title),React.createElement("span",{className:'chapter-description'},React.createElement(index_1.Markdown,null,chapter.description)));
23+
return(React.createElement(ProgressPage_1.ProgressPage,{key:'c'+chapterIndex+'p'+pageIndex,page:page,itemPosition:itemPosition,position:position}));
24+
})},React.createElement("h3",null,chapterIndex+1,". ",chapter.title),React.createElement("span",{className:'chapter-description'},React.createElement(index_1.Markdown,null,chapter.description))));
2525
}))));
2626
};

‎src/components/Alert/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ export class Alert extends React.Component<{alert: CR.Alert, alertToggle?: any},
2222
const{alert, alertToggle}=this.props;
2323
const{action, open, message, duration}=alert;
2424
return(
25-
<Snackbar
25+
<Snackbar
2626
className={classNames('cr-alert',action)}
2727
open={open||false}
2828
message={message||''}
2929
action={action}
3030
autoHideDuration={duration||1500}
3131
onActionTouchTap={alertToggle}
3232
onRequestClose={alertToggle}
33-
/>
34-
);
33+
/>
34+
);
3535
}
3636
}

‎src/components/AppMenu/MenuLink.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ export class MenuLink extends React.Component<{
1313
},{}>{
1414
render(){
1515
const{route, title, routeTo}=this.props;
16-
return<MenuItemprimaryText={title ?title :route}onTouchTap={routeTo.bind(this,route)}key={route}/>;
16+
return(
17+
<MenuItem
18+
primaryText={title ?title :route}
19+
onTouchTap={routeTo.bind(this,route)}
20+
key={route}
21+
/>
22+
);
1723
}
1824
}

‎src/components/AppMenu/index.tsx

Lines changed: 50 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,13 @@ export class AppMenu extends React.Component<{
4040
case'page':
4141
return<MenuLinkroute='progress'/>;
4242
case'progress':
43-
return<MenuItemonTouchTap={routeToPage}primaryText='page'key='page'/>;
43+
return(
44+
<MenuItem
45+
onTouchTap={routeToPage}
46+
primaryText='page'
47+
key='page'
48+
/>
49+
);
4450
default:returnnull;
4551
}
4652
}
@@ -50,9 +56,10 @@ export class AppMenu extends React.Component<{
5056
case'page':
5157
return(
5258
<div>
53-
<MenuLinkroute='progress'/>
54-
<MenuLinkroute='tutorials'/>
55-
</div>);
59+
<MenuLinkroute='progress'/>
60+
<MenuLinkroute='tutorials'/>
61+
</div>
62+
);
5663
case'progress':
5764
return<MenuLinkroute='tutorials'/>;
5865
default:returnnull;
@@ -63,31 +70,44 @@ export class AppMenu extends React.Component<{
6370
}
6471
render():React.ReactElement<{}>{
6572
const{quit}=this.props;
66-
return<AppBartitle='CodeRoad'
67-
className='cr-menu-bar'
68-
iconElementLeft={<IconButtononClick={this.closePanel}>
69-
<NavigationClose/>
70-
</IconButton>}
71-
iconElementRight={
72-
<IconMenuiconButtonElement={
73-
<IconButton><MoreVertIcon/></IconButton>
74-
}
75-
targetOrigin={origin}
76-
anchorOrigin={origin}>
77-
78-
{/* Menu Items */}
79-
{this.menuOptions()}
80-
81-
{window.coderoad.issuesPath
82-
?<MenuItemkey='issue'className='link'>
83-
<ahref={window.coderoad.issuesPath}>
84-
post issue
85-
</a>
86-
</MenuItem>
87-
:null}
88-
<Divider/>
89-
<MenuItemkey='quit'onClick={quit}>quit</MenuItem>
90-
</IconMenu>
91-
}/>;
73+
return(
74+
<AppBar
75+
title='CodeRoad'
76+
className='cr-menu-bar'
77+
iconElementLeft={
78+
<IconButtononClick={this.closePanel}>
79+
<NavigationClose/>
80+
</IconButton>}
81+
iconElementRight={
82+
<IconMenu
83+
iconButtonElement={
84+
<IconButton>
85+
<MoreVertIcon/>
86+
</IconButton>
87+
}
88+
targetOrigin={origin}
89+
anchorOrigin={origin}
90+
>
91+
{this.menuOptions()}
92+
{window.coderoad.issuesPath
93+
?<MenuItem
94+
key='issue'
95+
className='link'
96+
>
97+
<ahref={window.coderoad.issuesPath}>
98+
post issue
99+
</a>
100+
</MenuItem>
101+
:null}
102+
<Divider/>
103+
<MenuItem
104+
key='quit'
105+
onClick={quit}
106+
>
107+
quit
108+
</MenuItem>
109+
</IconMenu>
110+
}/>
111+
);
92112
}
93113
}

‎src/components/FinalPage/index.tsx

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,30 @@ import * as React from 'react';
22
import*asReactDOMfrom'react-dom';
33
importPaperfrom'material-ui/Paper';
44
importDividerfrom'material-ui/Divider';
5-
import{Card,CardTitle,CardText,CardACtions}from'material-ui/Card';
5+
import{Card,CardTitle,CardText,CardActions}from'material-ui/Card';
66
importFlatButtonfrom'material-ui/FlatButton';
77

88
exportconstFinalPage:React.StatelessComponent<{}>=()=>(
99
<Paper>
1010
<Card>
11-
<CardTitletitle='Congratulations!'
12-
subtitle='Tutorial Complete!'/>
11+
<CardTitle
12+
title='Congratulations!'
13+
subtitle='Tutorial Complete!'
14+
/>
1315
<CardText>
1416
What's next?
15-
16-
<CardActions>
17-
<ahref='https://coderoad.github.io/#tutorials'><FlatButtonlabel='See More Tutorials'disabled={true}/></a>
18-
<ahref='https://coderoad.github.io/build'><FlatButtonlabel='Learn how to Create a Tutorial'/></a>
19-
</CardActions>
2017
</CardText>
18+
<CardActions>
19+
<ahref='https://coderoad.github.io/#tutorials'>
20+
<FlatButton
21+
label='See More Tutorials'
22+
disabled={true}
23+
/>
24+
</a>
25+
<ahref='https://coderoad.github.io/build'>
26+
<FlatButtonlabel='Learn how to Create a Tutorial'/>
27+
</a>
28+
</CardActions>
2129
</Card>
2230
</Paper>
2331
);

‎src/components/Page/EditPage.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ export const EditPage: React.StatelessComponent<{
1010
}>=({editPath})=>{
1111
if(editPath&&window.coderoad.edit){
1212
letrepoPath=path.join(window.coderoad.repo,'edit','master',editPath);
13-
return<ahref={repoPath}>
14-
<ModeEditstyle={editStyle}/>
15-
</a>;
13+
return(
14+
<ahref={repoPath}>
15+
<ModeEditstyle={editStyle}/>
16+
</a>
17+
);
1618
}
1719
};

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp