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

Commit5c42567

Browse files
committed
create editor module
1 parent961c950 commit5c42567

File tree

27 files changed

+93
-79
lines changed

27 files changed

+93
-79
lines changed

‎lib/actions/_types.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
"use strict";
22
exports.COMPLETE_PAGE='COMPLETE_PAGE';
33
exports.COMPLETE_TUTORIAL='COMPLETE_TUTORIAL';
4-
exports.DEVTOOLS_TOGGLE='DEVTOOLS_TOGGLE';
54
exports.PAGE_SET='PAGE_SET';
65
exports.PROGRESS_LOAD='PROGRESS_LOAD';
76
exports.PROGRESS_PAGE_POSITION_LOAD='PROGRESS_PAGE_POSITION_LOAD';

‎lib/actions/index.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ exports.progressPagePositionLoad = progress_1.progressPagePositionLoad;
77
varpage_1=require('./page');
88
exports.pageSet=page_1.pageSet;
99
exports.pageNext=page_1.pageNext;
10-
vartoggle_1=require('./toggle');
11-
exports.devToolsToggle=toggle_1.devToolsToggle;
1210
varactions_1=require('../modules/alert/actions');
1311
exports.alertOpen=actions_1.alertOpen;
1412
exports.alertClose=actions_1.alertClose;

‎lib/actions/toggle.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +0,0 @@
1-
"use strict";
2-
var_types_1=require('./_types');
3-
functiondevToolsToggle(){
4-
return{type:_types_1.DEVTOOLS_TOGGLE};
5-
}
6-
exports.devToolsToggle=devToolsToggle;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"use strict";
22
varReact=require('react');
33
varToolbar_1=require('material-ui/Toolbar');
4-
varToggleLog_1=require('./ToggleLog');
4+
varindex_1=require('../../index');
55
varSave_1=require('./Save');
66
varContinue_1=require('./Continue');
77
varstyles={
@@ -15,7 +15,7 @@ var styles = {
1515
};
1616
exports.PageToolbar=function(_a){
1717
vartasks=_a.tasks,taskPosition=_a.taskPosition,children=_a.children;
18-
return(React.createElement("section",{styles:styles},children,React.createElement(Toolbar_1.Toolbar,null,React.createElement(Toolbar_1.ToolbarGroup,{float:'left'},React.createElement(ToggleLog_1.default,null)),React.createElement(Toolbar_1.ToolbarGroup,{float:'right'},taskPosition>=tasks.length ?
18+
return(React.createElement("section",{styles:styles},children,React.createElement(Toolbar_1.Toolbar,null,React.createElement(Toolbar_1.ToolbarGroup,{float:'left'},React.createElement(index_1.ToggleDevTools,null)),React.createElement(Toolbar_1.ToolbarGroup,{float:'right'},taskPosition>=tasks.length ?
1919
React.createElement(Continue_1.default,null) :React.createElement(Save_1.default,null)))));
2020
};
2121
Object.defineProperty(exports,"__esModule",{value:true});

‎lib/components/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,5 @@ var setup_1 = require('../modules/setup');
2323
exports.Checks=setup_1.Checks;
2424
vartutorials_1=require('../modules/tutorials');
2525
exports.Tutorials=tutorials_1.Tutorials;
26+
vareditor_1=require('../modules/editor');
27+
exports.ToggleDevTools=editor_1.ToggleDevTools;

‎lib/components/Page/PageToolbar/ToggleLog/index.jsrenamed to‎lib/modules/editor/ToggleDevTools/index.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,32 @@ var __metadata = (this && this.__metadata) || function (k, v) {
1414
if(typeofReflect==="object"&&typeofReflect.metadata==="function")returnReflect.metadata(k,v);
1515
};
1616
varReact=require('react');
17-
varcode_1=require('material-ui/svg-icons/action/code');
1817
varreact_redux_1=require('react-redux');
19-
varactions_1=require('../../../../actions');
18+
varactions_1=require('../actions');
2019
varFlatButton_1=require('material-ui/FlatButton');
20+
varcode_1=require('material-ui/svg-icons/action/code');
2121
varstyles={
2222
position:'relative',
2323
top:'10px',
2424
};
25-
varToggleLog=(function(_super){
26-
__extends(ToggleLog,_super);
27-
functionToggleLog(){
25+
varToggleDevTools=(function(_super){
26+
__extends(ToggleDevTools,_super);
27+
functionToggleDevTools(){
2828
_super.apply(this,arguments);
2929
}
30-
ToggleLog.prototype.render=function(){
31-
return(React.createElement(FlatButton_1.default,{style:styles,icon:React.createElement(code_1.default,null),onTouchTap:this.props.toggleDevTools}));
30+
ToggleDevTools.prototype.render=function(){
31+
return(React.createElement(FlatButton_1.default,{style:styles,icon:React.createElement(code_1.default,null),onTouchTap:this.props.toggle}));
3232
};
3333
;
34-
ToggleLog=__decorate([
34+
ToggleDevTools=__decorate([
3535
react_redux_1.connect(null,function(dispatch,state){
3636
return{
37-
toggleDevTools:function(){returndispatch(actions_1.devToolsToggle());}
37+
toggle:function(){returndispatch(actions_1.editorDevToolsToggle());}
3838
};
3939
}),
4040
__metadata('design:paramtypes',[])
41-
],ToggleLog);
42-
returnToggleLog;
41+
],ToggleDevTools);
42+
returnToggleDevTools;
4343
}(React.Component));
4444
Object.defineProperty(exports,"__esModule",{value:true});
45-
exports.default=ToggleLog;
45+
exports.default=ToggleDevTools;

‎lib/modules/editor/actions.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
"use strict";
2+
vartypes_1=require('./types');
3+
functioneditorDevToolsToggle(){
4+
return{type:types_1.EDITOR_DEVTOOLS_TOGGLE};
5+
}
6+
exports.editorDevToolsToggle=editorDevToolsToggle;
File renamed without changes.

‎lib/modules/editor/editor/index.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
"use strict";
2+
vartypes_1=require('../types');
3+
vareditor_1=require('../../../atom/editor');
4+
functioneditor(editor,action){
5+
if(editor===void0){editor='atom';}
6+
switch(action.type){
7+
casetypes_1.EDITOR_DEVTOOLS_TOGGLE:
8+
editor_1.toggleDevTools();
9+
returneditor;
10+
default:
11+
returneditor;
12+
}
13+
}
14+
Object.defineProperty(exports,"__esModule",{value:true});
15+
exports.default=editor;

‎lib/modules/editor/index.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
"use strict";
2+
vareditor_1=require('./editor');
3+
exports.editor=editor_1.default;
4+
vardir_1=require('./dir');
5+
exports.dir=dir_1.default;
6+
varToggleDevTools_1=require('./ToggleDevTools');
7+
exports.ToggleDevTools=ToggleDevTools_1.default;

‎lib/modules/editor/types.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
"use strict";
2+
exports.EDITOR_DEVTOOLS_TOGGLE='EDITOR_DEVTOOLS_TOGGLE';

‎lib/reducers/devTools-toggle/index.js

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

‎lib/reducers/index.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
"use strict";
22
varredux_1=require('redux');
3-
vardevTools_toggle_1=require('./devTools-toggle');
4-
vardir_1=require('./dir');
53
varpackage_json_1=require('./package-json');
64
varpage_1=require('./page');
75
varpage_position_1=require('./page-position');
@@ -17,9 +15,10 @@ var tests_1 = require('../modules/tests');
1715
vartutorial_1=require('../modules/tutorial');
1816
vartutorials_1=require('../modules/tutorials');
1917
varwindow_1=require('../modules/window');
18+
vareditor_1=require('../modules/editor');
2019
Object.defineProperty(exports,"__esModule",{value:true});
2120
exports.default=redux_1.combineReducers({
22-
alert:alert_1.reducer,checks:setup_1.reducer,devToolsToggle:devTools_toggle_1.default,dir:dir_1.default,hintPosition:hints_1.reducer,
21+
alert:alert_1.reducer,checks:setup_1.reducer,editor:editor_1.editor,dir:editor_1.dir,hintPosition:hints_1.reducer,
2322
packageJson:package_json_1.default,page:page_1.default,pagePosition:page_position_1.default,progress:progress_1.default,route:route_1.reducer,tasks:tasks_1.default,
2423
tutorial:tutorial_1.reducer,tutorials:tutorials_1.reducer,
2524
taskActions:task_actions_1.default,taskPosition:tests_1.taskPosition,taskTests:task_tests_1.default,testRun:tests_1.testRun,windowToggle:window_1.reducer

‎src/actions/_types.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
exportconstCOMPLETE_PAGE='COMPLETE_PAGE';
22
exportconstCOMPLETE_TUTORIAL='COMPLETE_TUTORIAL';
3-
exportconstDEVTOOLS_TOGGLE='DEVTOOLS_TOGGLE';
43
exportconstPAGE_SET='PAGE_SET';
54
exportconstPROGRESS_LOAD='PROGRESS_LOAD';
65
exportconstPROGRESS_PAGE_POSITION_LOAD='PROGRESS_PAGE_POSITION_LOAD';

‎src/actions/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ export {
55
}from'./progress';
66
export{pageSet,pageNext}from'./page';
77

8-
export{devToolsToggle}from'./toggle';
9-
108
// Modules
119
export{alertOpen,alertClose,alertReplay}from'../modules/alert/actions';
1210
export{routeSet}from'../modules/route/actions';
@@ -15,3 +13,4 @@ export {hintPositionSet} from '../modules/hints/actions';
1513
export{testRun,testResult,testSave,testComplete}from'../modules/tests/actions';
1614
export{tutorialSet}from'../modules/tutorial/actions';
1715
export{tutorialsFind,tutorialUpdate}from'../modules/tutorials/actions';
16+
export{devTools,dir}from'../modules/editor/actions';

‎src/actions/toggle.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +0,0 @@
1-
import{DEVTOOLS_TOGGLE}from'./_types';
2-
3-
exportfunctiondevToolsToggle():Action{
4-
return{type:DEVTOOLS_TOGGLE};
5-
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import*asReactfrom'react';
22
import{Toolbar,ToolbarGroup}from'material-ui/Toolbar';
3-
importToggleLogfrom'./ToggleLog';
3+
import{ToggleDevTools}from'../../index';
44
importSavefrom'./Save';
55
importContinuefrom'./Continue';
66

@@ -21,7 +21,7 @@ export const PageToolbar: React.StatelessComponent<{
2121
{children}
2222
<Toolbar>
2323
<ToolbarGroupfloat='left'>
24-
<ToggleLog/>
24+
<ToggleDevTools/>
2525
</ToolbarGroup>
2626
<ToolbarGroupfloat='right'>
2727
{taskPosition>=tasks.length ?

‎src/components/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ export {Alert} from '../modules/alert';
1111
export{RouteButton}from'../modules/route';
1212
export{Checks}from'../modules/setup';
1313
export{Tutorials}from'../modules/tutorials';
14+
export{ToggleDevTools}from'../modules/editor';

‎src/components/Page/PageToolbar/ToggleLog/index.tsxrenamed to‎src/modules/editor/ToggleDevTools/index.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import*asReactfrom'react';
2-
importCodefrom'material-ui/svg-icons/action/code';
32
import{connect}from'react-redux';
4-
import{devToolsToggle}from'../../../../actions';
3+
import{editorDevToolsToggle}from'../actions';
54
importFlatButtonfrom'material-ui/FlatButton';
5+
importCodefrom'material-ui/svg-icons/action/code';
66

77
conststyles={
88
position:'relative',
@@ -11,11 +11,11 @@ const styles = {
1111

1212
@connect(null,(dispatch,state)=>{
1313
return{
14-
toggleDevTools:()=>dispatch(devToolsToggle())
14+
toggle:()=>dispatch(editorDevToolsToggle())
1515
};
1616
})
17-
exportdefaultclassToggleLogextendsReact.Component<{
18-
toggleDevTools?:any
17+
exportdefaultclassToggleDevToolsextendsReact.Component<{
18+
toggle?:any
1919
},{}>{
2020
render(){
2121
return(
@@ -24,7 +24,7 @@ export default class ToggleLog extends React.Component<{
2424
icon={
2525
<Code/>
2626
}
27-
onTouchTap={this.props.toggleDevTools}
27+
onTouchTap={this.props.toggle}
2828
/>
2929
);
3030
};

‎src/modules/editor/actions.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import{EDITOR_DEVTOOLS_TOGGLE}from'./types';
2+
3+
exportfunctioneditorDevToolsToggle():Action{
4+
return{type:EDITOR_DEVTOOLS_TOGGLE};
5+
}
File renamed without changes.

‎src/modules/editor/editor/index.ts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import{EDITOR_DEVTOOLS_TOGGLE}from'../types';
2+
import{toggleDevTools}from'../../../atom/editor';
3+
4+
// trigger editor actions here
5+
exportdefaultfunctioneditor(
6+
editor='atom',action:Action
7+
):string{
8+
switch(action.type){
9+
10+
caseEDITOR_DEVTOOLS_TOGGLE:
11+
toggleDevTools();
12+
returneditor;
13+
14+
default:
15+
returneditor;
16+
}
17+
}

‎src/modules/editor/index.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
export{defaultaseditor}from'./editor';
2+
export{defaultasdir}from'./dir';
3+
4+
export{defaultasToggleDevTools}from'./ToggleDevTools';

‎src/modules/editor/types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
exportconstEDITOR_DEVTOOLS_TOGGLE='EDITOR_DEVTOOLS_TOGGLE';

‎src/reducers/devTools-toggle/index.ts

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

‎src/reducers/index.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import{combineReducers}from'redux';
22

33
// reducers
4-
importdevToolsTogglefrom'./devTools-toggle';
5-
importdirfrom'./dir';
64
importpackageJsonfrom'./package-json';
75
importpagefrom'./page';
86
importpagePositionfrom'./page-position';
@@ -20,9 +18,10 @@ import {testRun, taskPosition} from '../modules/tests';
2018
import{reducerastutorial}from'../modules/tutorial';
2119
import{reducerastutorials}from'../modules/tutorials';
2220
import{reduceraswindowToggle}from'../modules/window';
21+
import{dir,editor}from'../modules/editor';
2322

2423
exportdefaultcombineReducers({
25-
alert, checks,devToolsToggle, dir, hintPosition,
24+
alert, checks,editor, dir, hintPosition,
2625
packageJson, page, pagePosition, progress, route, tasks,
2726
tutorial, tutorials,
2827
taskActions, taskPosition, taskTests, testRun, windowToggle

‎tsconfig.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,11 @@
7575
"src/modules/alert/index.ts",
7676
"src/modules/alert/reducer.ts",
7777
"src/modules/alert/types.ts",
78+
"src/modules/editor/actions.ts",
79+
"src/modules/editor/dir/index.ts",
80+
"src/modules/editor/editor/index.ts",
81+
"src/modules/editor/index.ts",
82+
"src/modules/editor/types.ts",
7883
"src/modules/hints/actions.ts",
7984
"src/modules/hints/index.ts",
8085
"src/modules/hints/reducer.ts",
@@ -116,8 +121,6 @@
116121
"src/modules/window/index.ts",
117122
"src/modules/window/reducer.ts",
118123
"src/modules/window/types.ts",
119-
"src/reducers/devTools-toggle/index.ts",
120-
"src/reducers/dir/index.ts",
121124
"src/reducers/index.ts",
122125
"src/reducers/package-json/index.ts",
123126
"src/reducers/page-position/index.ts",
@@ -155,7 +158,6 @@
155158
"src/components/Page/PageToolbar/Continue/index.tsx",
156159
"src/components/Page/PageToolbar/index.tsx",
157160
"src/components/Page/PageToolbar/Save/index.tsx",
158-
"src/components/Page/PageToolbar/ToggleLog/index.tsx",
159161
"src/components/Page/ProgressBar/index.tsx",
160162
"src/components/Page/Task/index.tsx",
161163
"src/components/Page/Task/taskCheckbox.tsx",
@@ -169,6 +171,7 @@
169171
"src/components/Start/index.tsx",
170172
"src/components/Start/Welcome/index.tsx",
171173
"src/modules/alert/Alert.tsx",
174+
"src/modules/editor/ToggleDevTools/index.tsx",
172175
"src/modules/hints/Hints/HintButton.tsx",
173176
"src/modules/hints/Hints/index.tsx",
174177
"src/modules/route/RouteButton.tsx",

0 commit comments

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