Skip to content

Commit 335e91a

Browse files
committed
move options into core-coderoad
1 parent e4b8f57 commit 335e91a

File tree

10 files changed

+14
-30
lines changed

10 files changed

+14
-30
lines changed

lib/components/Page/Tests/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ var React = require('react');
1717
var react_redux_1 = require('react-redux');
1818
var path_1 = require('path');
1919
var actions_1 = require('../../../actions');
20-
var config_options_1 = require('../../../config-options');
20+
var options_1 = require('core-coderoad/lib/options');
2121
var FlatButton_1 = require('material-ui/FlatButton');
2222
var selectors_1 = require('../../../selectors');
2323
var styles = {
@@ -33,7 +33,7 @@ var Tests = (function (_super) {
3333
Tests.prototype.render = function () {
3434
var _this = this;
3535
var _a = this.props, tests = _a.tests, config = _a.config, style = _a.style, open = _a.open;
36-
var suffix = config_options_1.default[config.language].suffix;
36+
var suffix = options_1.default[config.language].language.suffix;
3737
return (React.createElement("div", {style: style}, tests.map(function (test, index) { return (React.createElement(FlatButton_1.default, {key: index, style: styles.button, onClick: open.bind(_this, test.concat('.' + suffix)), label: 'Test', secondary: true})); })));
3838
};
3939
Tests = __decorate([

lib/components/TutorialConfig/languageItems.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
"use strict";
22
var React = require('react');
33
var MenuItem_1 = require('material-ui/MenuItem');
4-
var config_options_1 = require('../../config-options');
4+
var options_1 = require('core-coderoad/lib/options');
55
function runnerItems() {
6-
return Object.keys(config_options_1.default).map(function (language, index) {
6+
return Object.keys(options_1.default).map(function (language, index) {
77
return (React.createElement(MenuItem_1.default, {key: index, value: language, primaryText: language}));
88
});
99
}

lib/components/TutorialConfig/runnerItems.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
"use strict";
22
var React = require('react');
33
var MenuItem_1 = require('material-ui/MenuItem');
4-
var config_options_1 = require('../../config-options');
4+
var options_1 = require('core-coderoad/lib/options');
55
function runnerItems(language) {
6-
return config_options_1.default[language].runners.map(function (runner, index) {
6+
return options_1.default[language].runners.map(function (runner, index) {
77
return (React.createElement(MenuItem_1.default, {key: index, value: runner, primaryText: runner}));
88
});
99
}

lib/modules/editor-paths/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"use strict";
22
var path_1 = require('path');
33
var actions_1 = require('../../actions');
4-
var config_options_1 = require('../../config-options');
4+
var options_1 = require('core-coderoad/lib/options');
55
var twoDigitify_1 = require('../../services/twoDigitify');
66
function editorMarkdownOpen(index, content) {
77
console.log(index, content);
@@ -17,7 +17,7 @@ function editorMarkdownOpen(index, content) {
1717
exports.editorMarkdownOpen = editorMarkdownOpen;
1818
function editorTestOpen(pageIndex, testIndex) {
1919
return function (dispatch, getState) {
20-
var suffix = config_options_1.default[getState().packageJson.config].suffix;
20+
var suffix = options_1.default[getState().packageJson.config].language.suffix;
2121
var filePath = path_1.join('tutorial', twoDigitify_1.default(pageIndex || getState().pagePosition), twoDigitify_1.default(testIndex) + '.' + suffix);
2222
dispatch(actions_1.editorOpen(filePath));
2323
};

src/components/Page/Tests/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as React from 'react';
22
import {connect} from 'react-redux';
33
import {join} from 'path';
44
import {editorOpen} from '../../../actions';
5-
import tutorialConfigOptions from '../../../config-options';
5+
import tutorialConfigOptions from 'core-coderoad/lib/options';
66
import FlatButton from 'material-ui/FlatButton';
77
import {configSelector} from '../../../selectors';
88

@@ -25,7 +25,7 @@ export default class Tests extends React.Component<{
2525
}, {}> {
2626
render() {
2727
const {tests, config, style, open} = this.props;
28-
const suffix = tutorialConfigOptions[config.language].suffix;
28+
const suffix = tutorialConfigOptions[config.language].language.suffix;
2929
return (
3030
<div style={style}>
3131
{tests.map((test, index) => (

src/components/TutorialConfig/languageItems.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from 'react';
22
import MenuItem from 'material-ui/MenuItem';
3-
import tutorialConfigOptions from '../../config-options';
3+
import tutorialConfigOptions from 'core-coderoad/lib/options';
44

55
export default function runnerItems() {
66
return Object.keys(tutorialConfigOptions).map((language, index) => {

src/components/TutorialConfig/runnerItems.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from 'react';
22
import MenuItem from 'material-ui/MenuItem';
3-
import tutorialConfigOptions from '../../config-options';
3+
import tutorialConfigOptions from 'core-coderoad/lib/options';
44

55
export default function runnerItems(language: string) {
66
return tutorialConfigOptions[language].runners.map((runner, index) => {

src/config-options.ts

Lines changed: 0 additions & 15 deletions
This file was deleted.

src/modules/editor-paths/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {join} from 'path';
22
import {editorOpen, editorScroll} from '../../actions';
3-
import tutorialConfigOptions from '../../config-options';
3+
import tutorialConfigOptions from 'core-coderoad/lib/options';
44
import twoDigitify from '../../services/twoDigitify';
55

66
export function editorMarkdownOpen(index?: number, content?: string) {
@@ -22,7 +22,7 @@ export function editorMarkdownOpen(index?: number, content?: string) {
2222
export function editorTestOpen(pageIndex: number, testIndex: number) {
2323
return (dispatch, getState) => {
2424
// get language suffix, ex: .js
25-
const suffix = tutorialConfigOptions[getState().packageJson.config].suffix;
25+
const suffix = tutorialConfigOptions[getState().packageJson.config].language.suffix;
2626
const filePath = join(
2727
'tutorial',
2828
twoDigitify(pageIndex || getState().pagePosition),

tsconfig.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
"src/components/Root.ts",
3131
"src/components/styles/theme.ts",
3232
"src/components/TopPanel/Top.ts",
33-
"src/config-options.ts",
3433
"src/index.ts",
3534
"src/modules/editor-paths/index.ts",
3635
"src/modules/package-json/actions.ts",

0 commit comments

Comments
 (0)