Skip to content

Commit 88cbb35

Browse files
committed
refactor MarkdownText to use props.children
1 parent 24d35ae commit 88cbb35

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
var final_page_1 = require('./final-page/final-page');
1919
exports.FinalPage = final_page_1.FinalPage;
2020
var markdown_1 = require('./markdown/markdown');
21-
exports.MarkdownText = markdown_1.default;
21+
exports.Markdown = markdown_1.Markdown;
2222
var alert_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
return marked(text.toString(), options);
2424
}
2525
;
26-
Object.defineProperty(exports, "__esModule", { value: true });
27-
exports.default = function (_a) {
28-
var text = _a.text;
29-
return (React.createElement("span", {className: 'cr-markdown', dangerouslySetInnerHTML: { __html: formatText(text) }}));
26+
exports.Markdown = function (_a) {
27+
var children = _a.children;
28+
var text = formatText(children);
29+
return React.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
var chapter = _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
var page = _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
var card_text_1 = require('material-ui/lib/card/card-text');
77
function default_1(_a) {
88
var page = _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
return React.createElement("div", null);
3636
}
3737
var hint = 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
var TaskContent = function (_a) {
3333
var task = _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
var task = _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
var itemPosition = { chapter: chapterIndex, page: pageIndex };
9494
return React.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
var setup_checker_1 = require('./setup-checker');
1818
var VerticalStep_1 = require('material-ui/lib/Stepper/VerticalStep');
1919
var flat_button_1 = require('material-ui/lib/flat-button');
20+
var _components_1 = require('../../_components');
2021
var action_setup_1 = require('../../../reducers/checks/action-setup');
2122
var react_redux_1 = require('react-redux');
2223
var store_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
};

0 commit comments

Comments
 (0)