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

Commit88cbb35

Browse files
committed
refactor MarkdownText to use props.children
1 parent24d35ae commit88cbb35

File tree

21 files changed

+40
-38
lines changed

21 files changed

+40
-38
lines changed

‎lib/components/_components.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ exports.Tutorials = tutorials_1.Tutorials;
1818
varfinal_page_1=require('./final-page/final-page');
1919
exports.FinalPage=final_page_1.FinalPage;
2020
varmarkdown_1=require('./markdown/markdown');
21-
exports.MarkdownText=markdown_1.default;
21+
exports.Markdown=markdown_1.Markdown;
2222
varalert_1=require('./alert/alert');
2323
exports.Alert=alert_1.default;

‎lib/components/markdown/markdown.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ function formatText(text) {
2323
returnmarked(text.toString(),options);
2424
}
2525
;
26-
Object.defineProperty(exports,"__esModule",{value:true});
27-
exports.default=function(_a){
28-
vartext=_a.text;
29-
return(React.createElement("span",{className:'cr-markdown',dangerouslySetInnerHTML:{__html:formatText(text)}}));
26+
exports.Markdown=function(_a){
27+
varchildren=_a.children;
28+
vartext=formatText(children);
29+
returnReact.createElement("span",{className:'cr-markdown',dangerouslySetInnerHTML:{__html:text}});
3030
};

‎lib/components/page/chapter/chapter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ var _components_1 = require('../../_components');
44
Object.defineProperty(exports,"__esModule",{value:true});
55
exports.default=function(_a){
66
varchapter=_a.chapter;
7-
return(React.createElement("section",{className:'cr-chapter'},React.createElement(_components_1.MarkdownText,{text:chapter.title})));
7+
return(React.createElement("section",{className:'cr-chapter'},React.createElement(_components_1.Markdown,null,chapter.title)));
88
};

‎lib/components/page/complete/page-complete.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ var _components_1 = require('../../_components');
55
exports.PageCompleteMessage=function(_a){
66
varpage=_a.page;
77
return(React.createElement("div",{className:'cr-page-onComplete'},page.completed&&page.onPageComplete ?
8-
React.createElement(list_item_1.default,{key:'page-complete'},React.createElement(_components_1.MarkdownText,{text:page.onPageComplete}))
8+
React.createElement(list_item_1.default,{key:'page-complete'},React.createElement(_components_1.Markdown,null,page.onPageComplete))
99
:null));
1010
};

‎lib/components/page/content.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var card_header_1 = require('material-ui/lib/card/card-header');
66
varcard_text_1=require('material-ui/lib/card/card-text');
77
functiondefault_1(_a){
88
varpage=_a.page;
9-
return(React.createElement(card_1.default,null,React.createElement(card_header_1.default,{title:page.title}),React.createElement(card_text_1.default,null,React.createElement(_components_1.MarkdownText,{text:page.description}))));
9+
return(React.createElement(card_1.default,null,React.createElement(card_header_1.default,{title:page.title}),React.createElement(card_text_1.default,null,React.createElement(_components_1.Markdown,null,page.description))));
1010
}
1111
Object.defineProperty(exports,"__esModule",{value:true});
1212
exports.default=default_1;

‎lib/components/page/hint/hint.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ var default_1 = (function (_super) {
3535
returnReact.createElement("div",null);
3636
}
3737
varhint=hints[hintPosition];
38-
return(React.createElement(card_1.default,{className:'cr-task-hints'},React.createElement(card_header_1.default,{title:'Hints',avatar:React.createElement(help_1.default,null),actAsExpander:true,showExpandableButton:true}),React.createElement(card_text_1.default,{className:'cr-task-hint',expandable:true},React.createElement(_components_1.MarkdownText,{text:hint})),React.createElement(card_actions_1.default,{expandable:true},React.createElement(flat_button_1.default,{label:'Previous',disabled:hintPosition<1,onTouchTap:prevHint.bind(this,hintPosition-1)}),React.createElement(flat_button_1.default,{label:'Next',disabled:hintPosition>hints.length-2,onTouchTap:nextHint.bind(this,hintPosition+1)}))));
38+
return(React.createElement(card_1.default,{className:'cr-task-hints'},React.createElement(card_header_1.default,{title:'Hints',avatar:React.createElement(help_1.default,null),actAsExpander:true,showExpandableButton:true}),React.createElement(card_text_1.default,{className:'cr-task-hint',expandable:true},React.createElement(_components_1.Markdown,null,hint)),React.createElement(card_actions_1.default,{expandable:true},React.createElement(flat_button_1.default,{label:'Previous',disabled:hintPosition<1,onTouchTap:prevHint.bind(this,hintPosition-1)}),React.createElement(flat_button_1.default,{label:'Next',disabled:hintPosition>hints.length-2,onTouchTap:nextHint.bind(this,hintPosition+1)}))));
3939
};
4040
default_1=__decorate([
4141
react_redux_1.connect(null,function(dispatch,state){

‎lib/components/page/task/task.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var TaskIndex = function (_a) {
3131
};
3232
varTaskContent=function(_a){
3333
vartask=_a.task;
34-
return(React.createElement("div",{className:'cr-task-description'},React.createElement(_components_1.MarkdownText,{text:task.description})));
34+
return(React.createElement("div",{className:'cr-task-description'},React.createElement(_components_1.Markdown,null,task.description)));
3535
};
3636
exports.Task=function(_a){
3737
vartask=_a.task,taskPosition=_a.taskPosition,index=_a.index,runTests=_a.runTests;

‎lib/components/progress/progress.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,6 @@ exports.default = function (_a) {
9292
}),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){
9393
varitemPosition={chapter:chapterIndex,page:pageIndex};
9494
returnReact.createElement(ProgressPage,{key:'c'+chapterIndex+'p'+pageIndex,page:page,itemPosition:itemPosition,position:position});
95-
})},React.createElement("h3",null,chapterIndex+1,". ",chapter.title),React.createElement("span",{className:'chapter-description'},React.createElement(_components_1.MarkdownText,{text:chapter.description})));
95+
})},React.createElement("h3",null,chapterIndex+1,". ",chapter.title),React.createElement("span",{className:'chapter-description'},React.createElement(_components_1.Markdown,null,chapter.description)));
9696
}))));
9797
};

‎lib/components/start/checks/checks.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ var React = require('react');
1717
varsetup_checker_1=require('./setup-checker');
1818
varVerticalStep_1=require('material-ui/lib/Stepper/VerticalStep');
1919
varflat_button_1=require('material-ui/lib/flat-button');
20+
var_components_1=require('../../_components');
2021
varaction_setup_1=require('../../../reducers/checks/action-setup');
2122
varreact_redux_1=require('react-redux');
2223
varstore_1=require('../../../store/store');
@@ -41,7 +42,7 @@ var Checks = (function (_super) {
4142
React.createElement(flat_button_1.default,{key:0,primary:true,label:'Verify',onTouchTap:verify})
4243
]},React.createElement("div",null,"Install a newer version of ",React.createElement("a",{href:'https://nodejs.org'},"Node"))),React.createElement(VerticalStep_1.default,{orderStepLabel:fail,stepLabel:'NPM >= 3',actions:[
4344
React.createElement(flat_button_1.default,{key:0,primary:true,label:'Verify',onTouchTap:verify}),
44-
]},React.createElement("div",null,"Update your version of NPM.",React.createElement("br",null),"`> npm update -g npm`"))),checks.setup.passed ?null :React.createElement(setup_checker_1.default,{title:'Setup Checks',status:this.getSetupChecks(checks)},React.createElement(VerticalStep_1.default,{orderStepLabel:fail,stepLabel:'working directory',actions:[
45+
]},React.createElement(_components_1.Markdown,null,"Update your version of NPM."+' '+"`> npm update -g npm`"))),checks.setup.passed ?null :React.createElement(setup_checker_1.default,{title:'Setup Checks',status:this.getSetupChecks(checks)},React.createElement(VerticalStep_1.default,{orderStepLabel:fail,stepLabel:'working directory',actions:[
4546
React.createElement(flat_button_1.default,{key:0,primary:true,label:'Verify',onTouchTap:verify}),
4647
React.createElement(flat_button_1.default,{key:1,secondary:true,label:'Do it for me',onTouchTap:action_setup_1.openDirectory})
4748
]},React.createElement("div",null,"File -> Open (a new folder)")),React.createElement(VerticalStep_1.default,{orderStepLabel:fail,stepLabel:'package.json',actions:[

‎lib/reducers/checks/verify.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ function verifySetup() {
1515
},
1616
setup:{
1717
dir:!!check_setup_1.hasDirectory(),
18-
packageJson:!!check_setup_1.hasPackageJson(),
18+
packageJson:false,
1919
tutorial:!!check_setup_1.hasTutorialDep()
2020
}
2121
};

‎src/components/_components.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ export {Tutorials} from './tutorials/tutorials';
1414
export{FinalPage}from'./final-page/final-page';
1515

1616
// Common
17-
export{defaultasMarkdownText}from'./markdown/markdown';
17+
export{Markdown}from'./markdown/markdown';
1818
export{defaultasAlert}from'./alert/alert';

‎src/components/markdown/markdown.tsx

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import*asReactfrom'react';
22
import*asmarkedfrom'marked';
33
constHighlights=require('highlights');
4-
lethighlighter=newHighlights({registry:atom.grammars});
4+
consthighlighter=newHighlights({registry:atom.grammars});
55

6-
varoptions={
7-
highlight:function(code:string,lang:string){
6+
constoptions={
7+
highlight:(code:string,lang:string)=>{
88
returnhighlighter.highlightSync({
99
fileContents:code,
1010
scopeName:'source.'+(lang||'js')
@@ -33,6 +33,9 @@ function formatText(text: string): string {
3333
* Markdown Text
3434
* MD -> HTML
3535
*/
36-
exportdefault({text})=>(
37-
<spanclassName='cr-markdown'dangerouslySetInnerHTML={{__html:formatText(text)}}></span>
38-
);
36+
exportconstMarkdown:React.StatelessComponent<any>=({children})=>{
37+
lettext=formatText(children);
38+
return<spanclassName='cr-markdown'dangerouslySetInnerHTML={
39+
{__html:text}
40+
}></span>;
41+
};
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
'use strict';
22
import*asReactfrom'react';
3-
import{MarkdownText}from'../../_components';
3+
import{Markdown}from'../../_components';
44
/**
55
* Chapters Component
66
* basic chapter info
77
*/
88
exportdefault({chapter})=>(
99
<sectionclassName='cr-chapter'>
10-
<MarkdownTexttext={chapter.title}/>
10+
<Markdown>{chapter.title}</Markdown>
1111
</section>
1212
);

‎src/components/page/complete/page-complete.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import*asReactfrom'react';
22
importListItemfrom'material-ui/lib/lists/list-item';
3-
import{MarkdownText}from'../../_components';
3+
import{Markdown}from'../../_components';
44

55
exportconstPageCompleteMessage=({page})=>(
66
<divclassName='cr-page-onComplete'>
77
{page.completed&&page.onPageComplete ?
88
<ListItemkey='page-complete'>
9-
<MarkdownTexttext={page.onPageComplete}/>
9+
<Markdown>{page.onPageComplete}</Markdown>
1010
</ListItem>
1111
:null}
1212
</div>

‎src/components/page/content.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import*asReactfrom'react';
2-
import{MarkdownText}from'../_components';
2+
import{Markdown}from'../_components';
33
importCardfrom'material-ui/lib/card/card';
44
importCardHeaderfrom'material-ui/lib/card/card-header';
55
importCardTextfrom'material-ui/lib/card/card-text';
@@ -9,7 +9,7 @@ export default function ({page}) {
99
<Card>
1010
<CardHeadertitle={page.title}/>
1111
<CardText>
12-
<MarkdownTexttext={page.description}/>
12+
<Markdown>{page.description}</Markdown>
1313
</CardText>
1414
</Card>
1515
);

‎src/components/page/hint/hint.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import CardActions from 'material-ui/lib/card/card-actions';
66
importCardHeaderfrom'material-ui/lib/card/card-header';
77
importCardTextfrom'material-ui/lib/card/card-text';
88
importFlatButtonfrom'material-ui/lib/flat-button';
9-
import{MarkdownText}from'../../_components';
9+
import{Markdown}from'../../_components';
1010
importHelpfrom'material-ui/lib/svg-icons/action/help';
1111

1212
@connect(null,(dispatch,state)=>{
@@ -34,7 +34,7 @@ export default class extends React.Component<{
3434
actAsExpander={true}
3535
showExpandableButton={true}/>
3636
<CardTextclassName='cr-task-hint'expandable={true}>
37-
<MarkdownTexttext={hint}/>
37+
<Markdown>{hint}</Markdown>
3838
</CardText>
3939
<CardActionsexpandable={true}>
4040
<FlatButtonlabel='Previous'disabled={hintPosition<1}

‎src/components/page/task/task.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import*asReactfrom'react';
2-
import{MarkdownText}from'../../_components';
2+
import{Markdown}from'../../_components';
33
importListfrom'material-ui/lib/lists/list';
44
importListItemfrom'material-ui/lib/lists/list-item';
55
importSubheaderfrom'material-ui/lib/Subheader';
@@ -31,7 +31,7 @@ const TaskIndex = ({index}) => (
3131

3232
constTaskContent=({task})=>(
3333
<divclassName='cr-task-description'>
34-
<MarkdownTexttext={task.description}/>
34+
<Markdown>{task.description}</Markdown>
3535
</div>
3636
);
3737

‎src/components/progress/progress.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import RaisedButton from 'material-ui/lib/raised-button';
66
importListfrom'material-ui/lib/lists/list';
77
importListItemfrom'material-ui/lib/lists/list-item';
88
importSubheaderfrom'material-ui/lib/Subheader';
9-
import{MarkdownText}from'../_components';
9+
import{Markdown}from'../_components';
1010
import*asclassnamesfrom'classnames';
1111
import*asColorsfrom'material-ui/lib/styles/colors';
1212
importCheckBoxfrom'material-ui/lib/svg-icons/toggle/check-box';
@@ -90,7 +90,7 @@ export default ({progress, position}) => (
9090
})}>
9191
<h3>{chapterIndex+1}.{chapter.title}</h3>
9292
<spanclassName='chapter-description'>
93-
<MarkdownTexttext={chapter.description}/>
93+
<Markdown>{chapter.description}</Markdown>
9494
</span>
9595
</ListItem>;
9696
})}

‎src/components/start/checks/checks.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import Paper from 'material-ui/lib/paper';
33
importDynamicStepperfrom'./setup-checker';
44
importStepfrom'material-ui/lib/Stepper/VerticalStep';
55
importFlatButtonfrom'material-ui/lib/flat-button';
6+
import{Markdown}from'../../_components';
67

78
import{openDirectory,createPackageJson,installTutorial}from'../../../reducers/checks/action-setup';
89
import{updateNpm}from'../../../reducers/checks/action-system';
@@ -54,10 +55,8 @@ export default class Checks extends React.Component<{
5455
onTouchTap={verify}/>,
5556

5657
]}>
57-
<div>
58-
Update your version of NPM.<br/>
59-
`>npmupdate-gnpm`
60-
</div>
58+
<Markdown>Update your version of NPM.
59+
`>npmupdate-gnpm`</Markdown>
6160
</Step>
6261
</DynamicStepper>}
6362

‎src/components/tutorials/tutorials.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import TableHeader from 'material-ui/lib/table/table-header';
77
importTableRowColumnfrom'material-ui/lib/table/table-row-column';
88
importTableBodyfrom'material-ui/lib/table/table-body';
99
importFileUploadfrom'material-ui/lib/svg-icons/file/file-upload';
10-
import{MarkdownText}from'../_components';
1110
import{connect}from'react-redux';
1211
import*asActionfrom'../../actions/actions';
1312
import{pink500}from'material-ui/lib/styles/colors';

‎src/reducers/checks/verify.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export default function verifySetup(): CR.Checks {
2121
},
2222
setup:{
2323
dir:!!hasDirectory(),
24-
packageJson:!!hasPackageJson(),
24+
packageJson:false,//!!hasPackageJson(),
2525
tutorial:!!hasTutorialDep()
2626
}
2727
};

0 commit comments

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