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

Commitfa6551f

Browse files
committed
various updates
1 parent77eafc1 commitfa6551f

File tree

11 files changed

+7542
-2660
lines changed

11 files changed

+7542
-2660
lines changed

‎lib/components/menu/menu.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,26 +30,26 @@ var default_1 = (function (_super) {
3030
default_1.prototype.navOptions=function(){
3131
switch(this.props.route){
3232
case'page':
33-
returnReact.createElement("button",{onClick:this.props.routeToProgress},"progress");
33+
returnReact.createElement("button",{onTouchTap:this.props.routeToProgress},"progress");
3434
case'progress':
35-
returnReact.createElement("button",{onClick:this.props.routeToPage},"page");
35+
returnReact.createElement("button",{onTouchTap:this.props.routeToPage},"page");
3636
default:returnnull;
3737
}
3838
};
3939
default_1.prototype.menuOptions=function(){
4040
switch(this.props.route){
4141
case'page':
42-
return(React.createElement("div",null,React.createElement(material_ui_1.MenuItem,{primaryText:'progress',onClick:this.props.routeToProgress}),React.createElement(material_ui_1.MenuItem,{primaryText:'projects',onClick:this.props.routeToProjects})));
42+
return(React.createElement("div",null,React.createElement(material_ui_1.MenuItem,{primaryText:'progress',onTouchTap:this.props.routeToProgress,key:'progress'}),React.createElement(material_ui_1.MenuItem,{primaryText:'projects',onTouchTap:this.props.routeToProjects,key:'projects'})));
4343
case'progress':
44-
returnReact.createElement(material_ui_1.MenuItem,{primaryText:'projects',onClick:this.props.routeToProjects});
44+
returnReact.createElement(material_ui_1.MenuItem,{primaryText:'projects',onTouchTap:this.props.routeToProjects,key:'projects'});
4545
default:returnnull;
4646
}
4747
};
4848
default_1.prototype.closePanel=function(){
4949
render_1.togglePanel();
5050
};
5151
default_1.prototype.render=function(){
52-
return(React.createElement(material_ui_1.AppBar,{title:'CodeRoad',className:'cr-menu-bar',iconElementLeft:React.createElement(material_ui_1.IconButton,{onClick:this.closePanel},React.createElement(NavigationClose,null)),iconElementRight:React.createElement(material_ui_1.IconMenu,{iconButtonElement:React.createElement(material_ui_1.IconButton,null,React.createElement(MoreVertIcon,null)),targetOrigin:{horizontal:'right',vertical:'top'},anchorOrigin:{horizontal:'right',vertical:'top'}},this.menuOptions(),window.coderoad.issuesPath ?React.createElement(material_ui_1.MenuItem,null,React.createElement("a",{href:window.coderoad.issuesPath},"post issue")) :null,React.createElement(material_ui_1.Divider,null),React.createElement(material_ui_1.MenuItem,{primaryText:'quit',onClick:this.props.quit}))}));
52+
return(React.createElement(material_ui_1.AppBar,{title:'CodeRoad',className:'cr-menu-bar',iconElementLeft:React.createElement(material_ui_1.IconButton,{onTouchTap:this.closePanel},React.createElement(NavigationClose,null)),iconElementRight:React.createElement(material_ui_1.IconMenu,{iconButtonElement:React.createElement(material_ui_1.IconButton,null,React.createElement(MoreVertIcon,null)),targetOrigin:{horizontal:'right',vertical:'top'},anchorOrigin:{horizontal:'right',vertical:'top'}},this.menuOptions(),window.coderoad.issuesPath ?React.createElement(material_ui_1.MenuItem,{key:'issue'},React.createElement("a",{href:window.coderoad.issuesPath},"post issue")) :null,React.createElement(material_ui_1.ListDivider,null),React.createElement(material_ui_1.MenuItem,{primaryText:'quit',onTouchTap:this.props.quit}))}));
5353
};
5454
default_1=__decorate([
5555
react_redux_1.connect(null,function(dispatch){

‎lib/components/page/hint.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ var material_ui_1 = require('material-ui');
2020
var_components_1=require('../_components');
2121
variconPath='material-ui/lib/svg-icons/';
2222
varHelp=require(iconPath+'action/help');
23-
varHelpOutline=require(iconPath+'action/help-outline');
2423
vardefault_1=(function(_super){
2524
__extends(default_1,_super);
2625
functiondefault_1(){
@@ -32,10 +31,8 @@ var default_1 = (function (_super) {
3231
if(hintPosition<0||!hints||!hints.length){
3332
returnReact.createElement("div",null);
3433
}
35-
else{
36-
varhint=hints[hintPosition];
37-
return(React.createElement(material_ui_1.Card,{className:'cr-task-hints'},React.createElement(material_ui_1.CardHeader,{title:'Hints',avatar:React.createElement(Help,null),actAsExpander:true,showExpandableButton:true}),React.createElement(material_ui_1.CardText,{className:'cr-task-hint',expandable:true},React.createElement(_components_1.MarkdownText,{text:hint})),React.createElement(material_ui_1.CardActions,{expandable:true},React.createElement(material_ui_1.FlatButton,{label:'Previous',disabled:hintPosition<1,onClick:prevHint.bind(this,hintPosition-1)}),React.createElement(material_ui_1.FlatButton,{label:'Next',disabled:hintPosition>hints.length-2,onClick:nextHint.bind(this,hintPosition+1)}))));
38-
}
34+
varhint=hints[hintPosition];
35+
return(React.createElement(material_ui_1.Card,{className:'cr-task-hints'},React.createElement(material_ui_1.CardHeader,{title:'Hints',avatar:React.createElement(Help,null),actAsExpander:true,showExpandableButton:true}),React.createElement(material_ui_1.CardText,{className:'cr-task-hint',expandable:true},React.createElement(_components_1.MarkdownText,{text:hint})),React.createElement(material_ui_1.CardActions,{expandable:true},React.createElement(material_ui_1.FlatButton,{label:'Previous',disabled:hintPosition<1,onTouchTap:prevHint.bind(this,hintPosition-1)}),React.createElement(material_ui_1.FlatButton,{label:'Next',disabled:hintPosition>hints.length-2,onTouchTap:nextHint.bind(this,hintPosition+1)}))));
3936
};
4037
default_1=__decorate([
4138
react_redux_1.connect(null,function(dispatch,state){

‎lib/components/page/page.js

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,18 @@ var __extends = (this && this.__extends) || function (d, b) {
44
function__(){this.constructor=d;}
55
d.prototype=b===null ?Object.create(b) :(__.prototype=b.prototype,new__());
66
};
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-
};
167
varReact=require('react');
178
varReactDOM=require('react-dom');
18-
varreact_redux_1=require('react-redux');
19-
varAction=require('../../actions/actions');
20-
variconPath='material-ui/lib/svg-icons/';
219
varmaterial_ui_1=require('material-ui');
22-
varComplete=require(iconPath+'toggle/check-box');
23-
varIncomplete=require(iconPath+'toggle/check-box-outline-blank');
24-
varRunningTest=require(iconPath+'toggle/indeterminate-check-box');
25-
varmaterial_ui_2=require('material-ui');
2610
varcontent_1=require('./content');
2711
vartask_1=require('./task');
2812
varhint_1=require('./hint');
2913
varpage_complete_1=require('./page-complete');
3014
vartoolbar_1=require('./toolbar');
31-
varInfo=require(iconPath+'action/info');
32-
varInfoOutline=require(iconPath+'action/info-outline');
33-
varstyle={
15+
varpageStyle={
3416
height:'100%',
3517
width:'100%'
3618
};
37-
functiontaskProgress(current,max){
38-
return(current/max)*100;
39-
}
4019
vardefault_1=(function(_super){
4120
__extends(default_1,_super);
4221
functiondefault_1(){
@@ -49,19 +28,8 @@ var default_1 = (function (_super) {
4928
var_a=this.props,page=_a.page,taskPosition=_a.taskPosition,hintPosition=_a.hintPosition,tasks=_a.tasks,runTests=_a.runTests;
5029
varcurrentTask=taskPosition<=tasks.length ?tasks[taskPosition] :null;
5130
varallComplete=taskPosition>=tasks.length;
52-
return(React.createElement(material_ui_2.Paper,{style:style,zDepth:1,className:'cr-page'},React.createElement(content_1.default,{page:page}),React.createElement(material_ui_1.Divider,null),React.createElement(task_1.Tasks,{tasks:tasks,taskPosition:taskPosition,runTests:runTests}),React.createElement(hint_1.default,{task:currentTask,hintPosition:hintPosition}),React.createElement(page_complete_1.PageCompleteMessage,{page:page}),React.createElement("div",{ref:'listEnd'}),React.createElement(toolbar_1.default,{tasks:tasks,taskPosition:taskPosition,hintPosition:hintPosition})));
31+
return(React.createElement(material_ui_1.Paper,{style:pageStyle,zDepth:1,className:'cr-page'},React.createElement(content_1.default,{page:page}),React.createElement(material_ui_1.ListDivider,null),React.createElement(task_1.Tasks,{tasks:tasks,taskPosition:taskPosition,runTests:runTests}),React.createElement(hint_1.default,{task:currentTask,hintPosition:hintPosition}),React.createElement(page_complete_1.PageCompleteMessage,{page:page}),React.createElement("div",{ref:'listEnd'}),React.createElement(toolbar_1.default,{tasks:tasks,taskPosition:taskPosition,hintPosition:hintPosition})));
5332
};
54-
default_1=__decorate([
55-
react_redux_1.connect(null,function(dispatch,state){
56-
return{
57-
callNextPage:function(){returndispatch(Action.nextPage());},
58-
callRunTests:function(){returndispatch(Action.runTests());},
59-
toggleLog:function(){returndispatch(Action.toggleLog());},
60-
showHint:function(newHintPos){returndispatch(Action.setHintPosition(newHintPos));}
61-
};
62-
}),
63-
__metadata('design:paramtypes',[])
64-
],default_1);
6533
returndefault_1;
6634
}(React.Component));
6735
Object.defineProperty(exports,"__esModule",{value:true});

‎lib/components/page/toolbar.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ var default_1 = (function (_super) {
3535
varprogress=taskProgress(taskPosition,tasks.length);
3636
varallComplete=taskPosition>=tasks.length;
3737
return(React.createElement("section",{className:'cr-page-toolbar'},React.createElement(ProgressBar,{progress:progress}),React.createElement(material_ui_1.Toolbar,null,React.createElement(material_ui_1.ToolbarGroup,{float:'right'},allComplete ?
38-
React.createElement(material_ui_1.RaisedButton,{label:'Continue',primary:true,onClick:callNextPage})
38+
React.createElement(material_ui_1.RaisedButton,{label:'Continue',primary:true,onTouchTap:callNextPage})
3939
:
40-
React.createElement(material_ui_1.RaisedButton,{label:'Run',secondary:true,onClick:callRunTests})))));
40+
React.createElement(material_ui_1.RaisedButton,{label:'Run',secondary:true,onTouchTap:callRunTests})))));
4141
};
4242
default_1=__decorate([
4343
react_redux_1.connect(null,function(dispatch,state){

‎src/components/_index.less

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@
1414
font-size:@font-size;
1515
}
1616

17+
#crva {
18+
text-decoration:none
19+
}
20+
#crva:visited {
21+
color:black;
22+
text-decoration:none;
23+
}
24+
1725
pre {
1826
margin-bottom:10px!important;
1927
padding-bottom:0;

‎src/components/menu/menu.tsx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import * as Action from '../../actions/actions';
55
import{togglePanel}from'../render';
66
import{onDeactivateSubscriptionsAndUnmount}from'../../atom/subscriptions';
77

8-
import{AppBar,IconButton,IconMenu,MenuItem,Divider}from'material-ui';
8+
import{AppBar,IconButton,IconMenu,MenuItem,ListDivider}from'material-ui';
99
letMoreVertIcon=require('material-ui/lib/svg-icons/navigation/more-vert');
1010
letNavigationClose=require('material-ui/lib/svg-icons/navigation/close');
1111
// let Feedback = require('material-ui/lib/svg-icons/action/feedback');
@@ -36,9 +36,9 @@ export default class extends React.Component<{
3636
navOptions():React.ReactElement<{}>{
3737
switch(this.props.route){
3838
case'page':
39-
return<buttononClick={this.props.routeToProgress}>progress</button>;
39+
return<buttononTouchTap={this.props.routeToProgress}>progress</button>;
4040
case'progress':
41-
return<buttononClick={this.props.routeToPage}>page</button>;
41+
return<buttononTouchTap={this.props.routeToPage}>page</button>;
4242
default:returnnull;
4343
}
4444
}
@@ -47,11 +47,11 @@ export default class extends React.Component<{
4747
case'page':
4848
return(
4949
<div>
50-
<MenuItemprimaryText='progress'onClick={this.props.routeToProgress}/>
51-
<MenuItemprimaryText='projects'onClick={this.props.routeToProjects}/>
50+
<MenuItemprimaryText='progress'onTouchTap={this.props.routeToProgress}key='progress'/>
51+
<MenuItemprimaryText='projects'onTouchTap={this.props.routeToProjects}key='projects'/>
5252
</div>);
5353
case'progress':
54-
return<MenuItemprimaryText='projects'onClick={this.props.routeToProjects}/>;
54+
return<MenuItemprimaryText='projects'onTouchTap={this.props.routeToProjects}key='projects'/>;
5555
default:returnnull;
5656
}
5757
}
@@ -62,7 +62,7 @@ export default class extends React.Component<{
6262
return(
6363
<AppBartitle={'CodeRoad'}
6464
className='cr-menu-bar'
65-
iconElementLeft={<IconButtononClick={this.closePanel}><NavigationClose/></IconButton>}
65+
iconElementLeft={<IconButtononTouchTap={this.closePanel}><NavigationClose/></IconButton>}
6666
iconElementRight={
6767
<IconMenu
6868
iconButtonElement={
@@ -74,14 +74,14 @@ export default class extends React.Component<{
7474
{/* Menu Items */}
7575
{this.menuOptions()}
7676
{}
77-
{window.coderoad.issuesPath ?<MenuItem>
77+
{window.coderoad.issuesPath ?<MenuItemkey='issue'>
7878
<ahref={window.coderoad.issuesPath}>
7979
post issue
8080
</a>
8181
</MenuItem> :null}
8282

83-
<Divider/>
84-
<MenuItemprimaryText='quit'onClick={this.props.quit}/>
83+
<ListDivider/>
84+
<MenuItemprimaryText='quit'onTouchTap={this.props.quit}/>
8585

8686
</IconMenu>
8787
}/>

‎src/components/page/hint.tsx

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import {Card, CardActions, CardHeader, CardText, FlatButton} from 'material-ui';
66
import{MarkdownText}from'../_components';
77
consticonPath='material-ui/lib/svg-icons/';
88
letHelp=require(iconPath+'action/help');
9-
letHelpOutline=require(iconPath+'action/help-outline');
109

1110
@connect(null,(dispatch,state)=>{
1211
return{
@@ -23,26 +22,25 @@ export default class extends React.Component<{
2322
consthints=task&&task.hints ?task.hints :null;
2423
if(hintPosition<0||!hints||!hints.length){
2524
return<div></div>;
26-
}else{
25+
}
2726
consthint=hints[hintPosition];
2827
return(
29-
<CardclassName='cr-task-hints'>
30-
<CardHeader
31-
title='Hints'
32-
avatar={<Help/>}
33-
actAsExpander={true}
34-
showExpandableButton={true}/>
35-
<CardTextclassName='cr-task-hint'expandable={true}>
36-
<MarkdownTexttext={hint}/>
37-
</CardText>
38-
<CardActionsexpandable={true}>
39-
<FlatButtonlabel='Previous'disabled={hintPosition<1}
40-
onClick={prevHint.bind(this,hintPosition-1)}/>
41-
<FlatButtonlabel='Next'disabled={hintPosition>hints.length-2}
42-
onClick={nextHint.bind(this,hintPosition+1)}/>
43-
</CardActions>
44-
</Card>
45-
);
28+
<CardclassName='cr-task-hints'>
29+
<CardHeader
30+
title='Hints'
31+
avatar={<Help/>}
32+
actAsExpander={true}
33+
showExpandableButton={true}/>
34+
<CardTextclassName='cr-task-hint'expandable={true}>
35+
<MarkdownTexttext={hint}/>
36+
</CardText>
37+
<CardActionsexpandable={true}>
38+
<FlatButtonlabel='Previous'disabled={hintPosition<1}
39+
onTouchTap={prevHint.bind(this,hintPosition-1)}/>
40+
<FlatButtonlabel='Next'disabled={hintPosition>hints.length-2}
41+
onTouchTap={nextHint.bind(this,hintPosition+1)}/>
42+
</CardActions>
43+
</Card>
44+
);
4645
}
4746
}
48-
}

‎src/components/page/page.tsx

Lines changed: 4 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,18 @@
11
'use strict';
22
import*asReactfrom'react';
33
import*asReactDOMfrom'react-dom';
4-
import{connect}from'react-redux';
5-
import*asActionfrom'../../actions/actions';
6-
consticonPath='material-ui/lib/svg-icons/';
7-
8-
// tasks
9-
import{MarkdownText}from'../_components';
10-
import{List,ListItem,Divider}from'material-ui';
11-
import{green500,orange500}from'material-ui/lib/styles/colors';
12-
import*asclassnamesfrom'classnames';
13-
letComplete=require(iconPath+'toggle/check-box');
14-
letIncomplete=require(iconPath+'toggle/check-box-outline-blank');
15-
letRunningTest=require(iconPath+'toggle/indeterminate-check-box');
16-
17-
18-
import{Paper,LinearProgress,Toolbar,ToolbarGroup,RaisedButton,FlatButton}from'material-ui';
19-
4+
import{Paper,ListDivider}from'material-ui';
205
importPageContentfrom'./content';
216
import{Tasks}from'./task';
227
importHintsfrom'./hint';
238
import{PageCompleteMessage}from'./page-complete';
249
importPageToolbarfrom'./toolbar';
25-
// import PageToolbar from './toolbar';
2610

27-
letInfo=require(iconPath+'action/info');
28-
letInfoOutline=require(iconPath+'action/info-outline');
29-
30-
conststyle={
11+
constpageStyle={
3112
height:'100%',
3213
width:'100%'
3314
};
3415

35-
functiontaskProgress(current:number,max:number){
36-
return(current/max)*100;
37-
}
38-
39-
/**
40-
* Page Component
41-
* display page data
42-
*/
43-
@connect(null,(dispatch,state)=>{
44-
return{
45-
callNextPage:()=>dispatch(Action.nextPage()),
46-
callRunTests:()=>dispatch(Action.runTests()),
47-
toggleLog:()=>dispatch(Action.toggleLog()),
48-
showHint:(newHintPos:number)=>dispatch(Action.setHintPosition(newHintPos))
49-
};
50-
})
5116
exportdefaultclassextendsReact.Component<{
5217
page:CR.Page,tasks:CR.Task[],taskPosition:number,
5318
editorActions:string[],log:any,hintPosition:number,
@@ -70,10 +35,9 @@ render() {
7035
constallComplete=taskPosition>=tasks.length;
7136

7237
return(
73-
<Paperstyle={style}zDepth={1}className='cr-page'>
74-
{/* Content */}
38+
<Paperstyle={pageStyle}zDepth={1}className='cr-page'>
7539
<PageContentpage={page}/>
76-
<Divider/>
40+
<ListDivider/>
7741

7842
<Taskstasks={tasks}taskPosition={taskPosition}runTests={runTests}/>
7943
<Hintstask={currentTask}hintPosition={hintPosition}/>

‎src/components/page/toolbar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ export default class extends React.Component<{
3737

3838
{/* check work || continue */}
3939
{allComplete ?
40-
<RaisedButtonlabel='Continue'primary={true}onClick={callNextPage}/>
40+
<RaisedButtonlabel='Continue'primary={true}onTouchTap={callNextPage}/>
4141
:
42-
<RaisedButtonlabel='Run'secondary={true}onClick={callRunTests}/>
42+
<RaisedButtonlabel='Run'secondary={true}onTouchTap={callRunTests}/>
4343
}
4444
</ToolbarGroup>
4545

0 commit comments

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