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

Commit7d8152d

Browse files
committed
updated for core-coderoad 0.3.0
1 parente82cbc1 commit7d8152d

File tree

32 files changed

+78
-104
lines changed

32 files changed

+78
-104
lines changed

‎lib/actions.js

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,14 @@ exports.tutorialSet = tutorial_1.tutorialSet;
1919
vartutorials_1=require('./modules/tutorials');
2020
exports.tutorialsFind=tutorials_1.tutorialsFind;
2121
exports.tutorialUpdate=tutorials_1.tutorialUpdate;
22-
varalert_1=require('core-coderoad/lib/alert');
23-
exports.alertOpen=alert_1.alertOpen;
24-
exports.alertClose=alert_1.alertClose;
25-
exports.alertReplay=alert_1.alertReplay;
26-
vareditor_1=require('core-coderoad/lib/editor');
27-
exports.editorDevToolsToggle=editor_1.editorDevToolsToggle;
28-
exports.editorOpen=editor_1.editorOpen;
29-
exports.editorInsert=editor_1.editorInsert;
30-
exports.editorSave=editor_1.editorSave;
31-
exports.editorSet=editor_1.editorSet;
32-
varroute_1=require('core-coderoad/lib/route');
33-
exports.routeSet=route_1.routeSet;
34-
varwindow_1=require('core-coderoad/lib/window');
35-
exports.windowToggle=window_1.windowToggle;
22+
varcore_coderoad_1=require('core-coderoad');
23+
exports.alertOpen=core_coderoad_1.alertOpen;
24+
exports.alertClose=core_coderoad_1.alertClose;
25+
exports.alertReplay=core_coderoad_1.alertReplay;
26+
exports.editorDevToolsToggle=core_coderoad_1.editorDevToolsToggle;
27+
exports.editorOpen=core_coderoad_1.editorOpen;
28+
exports.editorInsert=core_coderoad_1.editorInsert;
29+
exports.editorSave=core_coderoad_1.editorSave;
30+
exports.editorSet=core_coderoad_1.editorSet;
31+
exports.routeSet=core_coderoad_1.routeSet;
32+
exports.windowToggle=core_coderoad_1.windowToggle;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ var React = require('react');
1717
varreact_redux_1=require('react-redux');
1818
varFlatButton_1=require('material-ui/FlatButton');
1919
varactions_1=require('../../../actions');
20-
varselectors_1=require('core-coderoad/lib/selectors');
20+
varcore_coderoad_1=require('core-coderoad');
2121
varHintButton=(function(_super){
2222
__extends(HintButton,_super);
2323
functionHintButton(){
@@ -35,7 +35,7 @@ var HintButton = (function (_super) {
3535
HintButton=__decorate([
3636
react_redux_1.connect(function(state){return({
3737
hintPosition:state.hintPosition,
38-
hintsLength:selectors_1.hintsSelector(state).length,
38+
hintsLength:core_coderoad_1.hintsSelector(state).length,
3939
});},{hintPositionSet:actions_1.hintPositionSet}),
4040
__metadata('design:paramtypes',[])
4141
],HintButton);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var Card_1 = require('material-ui/Card');
1919
varindex_1=require('../../index');
2020
varHintButton_1=require('./HintButton');
2121
varhelp_1=require('material-ui/svg-icons/action/help');
22-
varselectors_1=require('core-coderoad/lib/selectors');
22+
varcore_coderoad_1=require('core-coderoad');
2323
varstyles={
2424
position:'relative',
2525
margin:'5px auto 10px',
@@ -40,7 +40,7 @@ var Hints = (function (_super) {
4040
};
4141
Hints=__decorate([
4242
react_redux_1.connect(function(state){return({
43-
hint:selectors_1.hintSelector(state),
43+
hint:core_coderoad_1.hintSelector(state),
4444
});}),
4545
__metadata('design:paramtypes',[])
4646
],Hints);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var Toolbar_1 = require('material-ui/Toolbar');
1919
varSave_1=require('./Save');
2020
varContinue_1=require('./Continue');
2121
varToggleDevTools_1=require('./ToggleDevTools');
22-
varselectors_1=require('core-coderoad/lib/selectors');
22+
varcore_coderoad_1=require('core-coderoad');
2323
varstyles={
2424
zIndex:'5',
2525
position:'relative',
@@ -40,7 +40,7 @@ var PageToolbar = (function (_super) {
4040
};
4141
PageToolbar=__decorate([
4242
react_redux_1.connect(function(state){return({
43-
tasksComplete:selectors_1.taskProgressSelector(state)===100
43+
tasksComplete:core_coderoad_1.taskProgressSelector(state)===100
4444
});}),
4545
__metadata('design:paramtypes',[])
4646
],PageToolbar);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var index_1 = require('../../index');
1919
vartaskCheckbox_1=require('./taskCheckbox');
2020
varList_1=require('material-ui/List');
2121
varcolors_1=require('material-ui/styles/colors');
22-
varselectors_1=require('core-coderoad/lib/selectors');
22+
varcore_coderoad_1=require('core-coderoad');
2323
varstyles={
2424
task:{
2525
margin:'5px',
@@ -53,7 +53,7 @@ var Task = (function (_super) {
5353
react_redux_1.connect(function(state,props){return({
5454
testRun:state.testRun,
5555
isCompletedTask:state.taskPosition>props.index,
56-
task:selectors_1.taskByIndexSelector(state,props)
56+
task:core_coderoad_1.taskByIndexSelector(state,props)
5757
});}),
5858
__metadata('design:paramtypes',[])
5959
],Task);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ var Card_1 = require('material-ui/Card');
2121
varSubheader_1=require('material-ui/Subheader');
2222
varTask_1=require('../Task');
2323
varcolors_1=require('material-ui/styles/colors');
24-
varselectors_1=require('core-coderoad/lib/selectors');
24+
varcore_coderoad_1=require('core-coderoad');
2525
varmargin='10px 5px';
2626
varTasks=(function(_super){
2727
__extends(Tasks,_super);
@@ -40,8 +40,8 @@ var Tasks = (function (_super) {
4040
};
4141
Tasks=__decorate([
4242
react_redux_1.connect(function(state){return({
43-
tasks:selectors_1.visibleTasksSelector(state),
44-
completed:selectors_1.pageCompletedSelector(state),
43+
tasks:core_coderoad_1.visibleTasksSelector(state),
44+
completed:core_coderoad_1.pageCompletedSelector(state),
4545
});}),
4646
__metadata('design:paramtypes',[])
4747
],Tasks);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ var react_redux_1 = require('react-redux');
1818
varCard_1=require('material-ui/Card');
1919
varindex_1=require('../../index');
2020
varcolors_1=require('material-ui/styles/colors');
21-
varselectors_1=require('core-coderoad/lib/selectors');
21+
varcore_coderoad_1=require('core-coderoad');
2222
varstyles={
2323
card:{
2424
backgroundColor:colors_1.cyan500,
@@ -40,7 +40,7 @@ var TasksComplete = (function (_super) {
4040
};
4141
TasksComplete=__decorate([
4242
react_redux_1.connect(function(state){return({
43-
onPageComplete:selectors_1.pageSelector(state).onPageComplete,
43+
onPageComplete:core_coderoad_1.pageSelector(state).onPageComplete,
4444
});}),
4545
__metadata('design:paramtypes',[])
4646
],TasksComplete);

‎lib/components/Page/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ var Hints_1 = require('./Hints');
2121
varPageToolbar_1=require('./PageToolbar');
2222
varProgressBar_1=require('./ProgressBar');
2323
varTasksComplete_1=require('./TasksComplete');
24-
varselectors_1=require('core-coderoad/lib/selectors');
24+
varcore_coderoad_1=require('core-coderoad');
2525
varstyles={
2626
page:{
2727
width:'100%',
@@ -39,8 +39,8 @@ var Page = (function (_super) {
3939
};
4040
Page=__decorate([
4141
react_redux_1.connect(function(state){return({
42-
page:selectors_1.pageSelector(state),
43-
tasksCompleted:selectors_1.taskProgressSelector(state)===100,
42+
page:core_coderoad_1.pageSelector(state),
43+
tasksCompleted:core_coderoad_1.taskProgressSelector(state)===100,
4444
});}),
4545
__metadata('design:paramtypes',[])
4646
],Page);

‎lib/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
"use strict";
22
varrender_1=require('./components/render');
33
varelement_1=require('./components/SidePanel/element');
4-
varpolyfills_1=require('core-coderoad/lib/polyfills');
4+
varcore_coderoad_1=require('core-coderoad');
55
varsubscriptions_1=require('./subscriptions');
66
varstore_1=require('./store');
77
varsetup_1=require('./modules/setup');
88
varinjectTapEventPlugin=require('react-tap-event-plugin');
99
varMain=(function(){
1010
functionMain(){
1111
injectTapEventPlugin();
12-
polyfills_1.default();
12+
core_coderoad_1.loadPolyfills();
1313
store_1.default.dispatch(setup_1.setupVerify());
1414
this.root=element_1.default.init();
1515
}
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
"use strict";
22
varpath_1=require('path');
3-
vareditor_1=require('core-coderoad/lib/editor');
3+
varcore_coderoad_1=require('core-coderoad');
44
varpackageData="{\n \"name\": \"demo\",\n \"dependencies\": {\n \"coderoad-functional-school\": \"^0.2.2\"\n }\n}";
55
functioncreatePackageJson(dir){
66
varpackagePath=path_1.join(dir,'package.json');
77
returnnewPromise(function(resolve,reject){
8-
editor_1.open(packagePath);
8+
core_coderoad_1.open(packagePath);
99
setTimeout(function(){returnresolve();});
1010
}).then(function(){
11-
editor_1.set(packageData);
11+
core_coderoad_1.set(packageData);
1212
});
1313
}
1414
exports.createPackageJson=createPackageJson;
1515
functionopenDirectory(){
16-
editor_1.openFolder();
16+
core_coderoad_1.openFolder();
1717
}
1818
exports.openDirectory=openDirectory;

‎lib/modules/tutorial/actions.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
"use strict";
22
vartypes_1=require('./types');
3-
varroute_1=require('core-coderoad/lib/route');
3+
varcore_coderoad_1=require('core-coderoad');
44
functiontutorialSet(name){
55
returnfunction(dispatch,getState){
66
vardir=getState().dir;
77
dispatch({type:types_1.TUTORIAL_SET,payload:{name:name,dir:dir}});
8-
dispatch(route_1.routeSet('progress'));
8+
dispatch(core_coderoad_1.routeSet('progress'));
99
};
1010
}
1111
exports.tutorialSet=tutorialSet;

‎lib/modules/tutorials/actions.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22
vartypes_1=require('./types');
3-
varalert_1=require('core-coderoad/lib/alert');
3+
varcore_coderoad_1=require('core-coderoad');
44
varactions_1=require('../tutorial/actions');
55
exports.tutorialSet=actions_1.tutorialSet;
66
functiontutorialUpdate(title){
@@ -11,7 +11,7 @@ function tutorialUpdate(title) {
1111
duration:3000,
1212
};
1313
dispatch({type:types_1.TUTORIAL_UPDATE,payload:{title:title}});
14-
dispatch(alert_1.alertOpen(alert));
14+
dispatch(core_coderoad_1.alertOpen(alert));
1515
};
1616
}
1717
exports.tutorialUpdate=tutorialUpdate;

‎lib/reducers.js

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,11 @@ var setup_1 = require('./modules/setup');
77
vartests_1=require('./modules/tests');
88
vartutorial_1=require('./modules/tutorial');
99
vartutorials_1=require('./modules/tutorials');
10-
varalert_1=require('core-coderoad/lib/alert');
11-
vareditor_1=require('core-coderoad/lib/editor');
12-
varroute_1=require('core-coderoad/lib/route');
13-
varwindow_1=require('core-coderoad/lib/window');
10+
varcore_coderoad_1=require('core-coderoad');
1411
Object.defineProperty(exports,"__esModule",{value:true});
1512
exports.default=redux_1.combineReducers({
16-
alert:alert_1.reducer,checks:setup_1.checks,editor:editor_1.reducer,dir:editor_1.dir,hintPosition:hints_1.reducer,
17-
packageJson:setup_1.packageJson,pagePosition:page_1.pagePosition,progress:progress_1.reducer,route:route_1.reducer,
13+
alert:core_coderoad_1.alertReducer,checks:setup_1.checks,editor:core_coderoad_1.editorReducer,dir:core_coderoad_1.dirReducer,hintPosition:hints_1.reducer,
14+
packageJson:setup_1.packageJson,pagePosition:page_1.pagePosition,progress:progress_1.reducer,route:core_coderoad_1.routeReducer,
1815
tutorial:tutorial_1.reducer,tutorials:tutorials_1.reducer,
19-
taskActions:page_1.taskActions,taskPosition:tests_1.taskPosition,taskTests:page_1.taskTests,testRun:tests_1.testRun,windowToggle:window_1.reducer
16+
taskActions:page_1.taskActions,taskPosition:tests_1.taskPosition,taskTests:page_1.taskTests,testRun:tests_1.testRun,windowToggle:core_coderoad_1.windowToggle
2017
});

‎lib/store.js

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
11
"use strict";
2-
varredux_1=require('redux');
32
varreducers_1=require('./reducers');
4-
varcreateLogger=require('redux-logger');
5-
varredux_throttle_actions_1=require('redux-throttle-actions');
6-
varredux_thunk_1=require('redux-thunk');
7-
varmiddlewares=[redux_thunk_1.default];
8-
varthrottleTestRun=redux_throttle_actions_1.default(['TEST_RUN'],800);
9-
middlewares.push(throttleTestRun);
10-
vardevMode=false;
11-
if(devMode){
12-
varlogger=createLogger();
13-
middlewares.push(logger);
14-
}
15-
varstore=redux_1.createStore(reducers_1.default,redux_1.applyMiddleware.apply(void0,middlewares));
3+
varcore_coderoad_1=require('core-coderoad');
164
Object.defineProperty(exports,"__esModule",{value:true});
17-
exports.default=store;
5+
exports.default=core_coderoad_1.configureStore(reducers_1.default,true,{TEST_RUN:800});

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"dependencies": {
3232
"atom-plugin-command-line":"1.0.2",
3333
"coderoad-cli":"0.6.0",
34-
"core-coderoad":"0.2.0",
34+
"core-coderoad":"0.3.0",
3535
"highlights":"1.3.1",
3636
"marked":"0.3.5",
3737
"material-ui":"0.15.0",

‎src/actions.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ export {setupVerify, setupPackage} from './modules/setup/actions';
66
export{tutorialSet}from'./modules/tutorial';
77
export{tutorialsFind,tutorialUpdate}from'./modules/tutorials';
88

9-
export{alertOpen,alertClose,alertReplay}from'core-coderoad/lib/alert';
10-
export{editorDevToolsToggle,editorOpen,editorInsert,
11-
editorSave,editorSet}from'core-coderoad/lib/editor';
12-
export{routeSet}from'core-coderoad/lib/route';
13-
export{windowToggle}from'core-coderoad/lib/window';
9+
export{
10+
alertOpen,alertClose,alertReplay,
11+
editorDevToolsToggle,editorOpen,editorInsert,
12+
editorSave,editorSet,
13+
routeSet,
14+
windowToggle
15+
}from'core-coderoad';

‎src/components/AppMenu/Quit/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import*asReactfrom'react';
22
import{connect}from'react-redux';
3-
import{quit}from'core-coderoad/lib/editor';
3+
import{quit}from'core-coderoad';
44
import{onDeactivate}from'../../../subscriptions';
55
importMenuItemfrom'material-ui/MenuItem';
66

‎src/components/Page/Hints/HintButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as React from 'react';
22
import{connect}from'react-redux';
33
importFlatButtonfrom'material-ui/FlatButton';
44
import{hintPositionSet}from'../../../actions';
5-
import{hintsSelector}from'core-coderoad/lib/selectors';
5+
import{hintsSelector}from'core-coderoad';
66

77
@connect(state=>({
88
hintPosition:state.hintPosition,

‎src/components/Page/Hints/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {Card, CardActions, CardHeader, CardText} from 'material-ui/Card';
44
import{Markdown}from'../../index';
55
importHintButtonfrom'./HintButton';
66
importHelpfrom'material-ui/svg-icons/action/help';
7-
import{hintSelector}from'core-coderoad/lib/selectors';
7+
import{hintSelector}from'core-coderoad';
88

99
conststyles={
1010
position:'relative',

‎src/components/Page/PageToolbar/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {Toolbar, ToolbarGroup} from 'material-ui/Toolbar';
44
importSavefrom'./Save';
55
importContinuefrom'./Continue';
66
importToggleDevToolsfrom'./ToggleDevTools';
7-
import{taskProgressSelector}from'core-coderoad/lib/selectors';
7+
import{taskProgressSelector}from'core-coderoad';
88

99
conststyles={
1010
zIndex:'5',

‎src/components/Page/ProgressBar/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import*asReactfrom'react';
22
import{connect}from'react-redux';
33
importLinearProgressfrom'material-ui/LinearProgress';
4-
import{taskProgressSelector}from'core-coderoad/lib/selectors';
4+
import{taskProgressSelector}from'core-coderoad';
55

66
conststyle={
77
height:'10px',

‎src/components/Page/Task/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {Markdown} from '../../index';
44
importTaskCheckboxfrom'./taskCheckbox';
55
import{ListItem}from'material-ui/List';
66
import{lightGreen200,orange200}from'material-ui/styles/colors';
7-
import{taskByIndexSelector}from'core-coderoad/lib/selectors';
7+
import{taskByIndexSelector}from'core-coderoad';
88

99
conststyles={
1010
task:{

‎src/components/Page/Tasks/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {Card} from 'material-ui/Card';
66
importSubheaderfrom'material-ui/Subheader';
77
importTaskfrom'../Task';
88
import{lightGreen200}from'material-ui/styles/colors';
9-
import{pageCompletedSelector,visibleTasksSelector}from'core-coderoad/lib/selectors';
9+
import{pageCompletedSelector,visibleTasksSelector}from'core-coderoad';
1010

1111
constmargin='10px 5px';
1212

‎src/components/Page/TasksComplete/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {connect} from 'react-redux';
33
import{Card,CardText}from'material-ui/Card';
44
import{Markdown}from'../../index';
55
import{cyan500,grey100}from'material-ui/styles/colors';
6-
import{pageSelector}from'core-coderoad/lib/selectors';
6+
import{pageSelector}from'core-coderoad';
77

88
conststyles={
99
card:{

‎src/components/Page/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import Hints from './Hints';
88
importPageToolbarfrom'./PageToolbar';
99
importProgressBarfrom'./ProgressBar';
1010
importTasksCompletefrom'./TasksComplete';
11-
import{pageSelector,taskProgressSelector}from'core-coderoad/lib/selectors';
11+
import{pageSelector,taskProgressSelector}from'core-coderoad';
1212

1313
conststyles={
1414
page:{

‎src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import*asReactfrom'react';
22
importrenderfrom'./components/render';
33
importsidePanelElementfrom'./components/SidePanel/element';
4-
importloadPolyfillsfrom'core-coderoad/lib/polyfills';
4+
import{loadPolyfills}from'core-coderoad';
55
import{onActivate,onDeactivate,addToStatusBar}from'./subscriptions';
66
// activate Redux
77
importstorefrom'./store';

‎src/modules/setup/utils/action-setup.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import{join}from'path';
2-
import{open,set,openFolder,openTerminal}from'core-coderoad/lib/editor';
2+
import{open,set,openFolder,openTerminal}from'core-coderoad';
33
import{setupVerify}from'../actions';
44

55
constpackageData=`{

‎src/modules/tests/test-run/parse-loaders.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import{normalize,join}from'path';
22
import{readFileSync}from'fs';
33

4-
// TODO: load comments from core-coderoad/lib/options
4+
// TODO: load comments from core-coderoad
55

66
constcomments={
77
py:'#',

0 commit comments

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