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

Commit0bf9db1

Browse files
committed
various fixes, minor
1 parent6defdf2 commit0bf9db1

File tree

35 files changed

+121
-105
lines changed

35 files changed

+121
-105
lines changed

‎lib/reducers/checks/action-setup.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
"use strict";
2-
varpath=require('path');
2+
varpath_1=require('path');
33
vareditor_1=require('../../atom/editor');
44
varactions_1=require('../../atom/actions');
55
varstore_1=require('../../store/store');
66
varactions_2=require('../../actions/actions');
77
varpackageData="{\n \"name\": \"demo\",\n \"dependencies\": {\n \"coderoad-functional-school\": \"^0.2.1\"\n }\n}";
88
functioncreatePackageJson(){
9-
varpackagePath=path.join(window.coderoad.dir,'package.json');
9+
varpackagePath=path_1.join(window.coderoad.dir,'package.json');
1010
returnnewPromise(function(resolve,reject){
1111
editor_1.open(packagePath);
1212
setTimeout(function(){

‎lib/reducers/editor-actions/action-helpers.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@ function getCommand(actionString) {
1111
}
1212
exports.getCommand=getCommand;
1313
functiongetParams(actionString){
14+
varparser=newparser_1.ParseParams;
1415
varcommand=getCommand(actionString);
1516
varparams=actionString.substring(command.length+1,actionString.length-1);
1617
if(!params.length){
1718
console.error('Error loading editor action params ',actionString);
1819
returnnull;
1920
}
20-
varparamsList=parser_1.parseParams.getParams(params);
21+
varparamsList=parser.getParams(params);
2122
returnparamsList;
2223
}
2324
exports.getParams=getParams;

‎lib/reducers/editor-actions/actions.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"use strict";
2-
varEditor=require('../../atom/editor');
2+
vareditor_1=require('../../atom/editor');
33
varactions_1=require('../../atom/actions');
44
varaction_helpers_1=require('./action-helpers');
55
varType={
@@ -18,7 +18,7 @@ function editorActions(actionString) {
1818
varfile=obj.param;
1919
varoptions=obj.options;
2020
if(params.length===1){
21-
Editor.open(file,options);
21+
editor_1.open(file,options);
2222
setTimeout(function(){
2323
resolve();
2424
},100);
@@ -28,7 +28,7 @@ function editorActions(actionString) {
2828
if(params.length===1){
2929
varcontent_1=params[0];
3030
setTimeout(function(){
31-
Editor.set(content_1);
31+
editor_1.set(content_1);
3232
resolve(true);
3333
});
3434
}
@@ -37,7 +37,7 @@ function editorActions(actionString) {
3737
if(params.length===1){
3838
varcontent_2=params[0];
3939
setTimeout(function(){
40-
Editor.insert(content_2,{});
40+
editor_1.insert(content_2,{});
4141
resolve(true);
4242
});
4343
}

‎lib/reducers/editor-actions/editor-actions.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"use strict";
2-
varType=require('../../actions/actionTypes');
2+
varactionTypes_1=require('../../actions/actionTypes');
33
vartimes=require('lodash').times;
44
varactions_1=require('./actions');
55
functionhandleEditorActions(actionArray){
@@ -12,12 +12,12 @@ var actions;
1212
functioneditorActionsReducer(editorActions,action){
1313
if(editorActions===void0){editorActions=[];}
1414
switch(action.type){
15-
caseType.SET_PAGE:
15+
caseactionTypes_1.SET_PAGE:
1616
actions=action.payload.actions;
1717
currentTaskPosition=0;
1818
handleEditorActions(actions.shift());
1919
returnactions;
20-
caseType.TEST_RESULT:
20+
caseactionTypes_1.TEST_RESULT:
2121
actions=action.payload.actions;
2222
varnextTaskPosition=action.payload.result.taskPosition;
2323
if(nextTaskPosition>currentTaskPosition){

‎lib/reducers/editor-actions/parser.js

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
"use strict";
2-
exports.parseParams={
3-
trim:function(text){
2+
varParseParams=(function(){
3+
functionParseParams(){
4+
this.reset();
5+
}
6+
ParseParams.prototype.trim=function(text){
47
text=text.trim();
58
varfirstBracket=text.charAt(0).match(/["']/);
69
if(firstBracket&&!!text.charAt(text.length-1).match(firstBracket[0])){
710
text=text.substring(1,text.length-1);
811
}
912
returntext;
10-
},
11-
addBreak:function(char,index){
13+
};
14+
ParseParams.prototype.addBreak=function(char,index){
1215
switch(char){
1316
case'(':
1417
this.round+=1;
@@ -39,19 +42,22 @@ exports.parseParams = {
3942
else{
4043
this.current+=char;
4144
}
42-
},
43-
getParams:function(text){
45+
};
46+
ParseParams.prototype.getParams=function(text){
4447
this.reset();
4548
for(vari=0;i<text.length;i++){
4649
this.addBreak(text[i],i);
4750
}
4851
returnthis.params.concat(this.trim(this.current));
49-
},
50-
reset:function(){
52+
};
53+
ParseParams.prototype.reset=function(){
5154
this.round=0;
5255
this.square=0;
5356
this.curly=0;
5457
this.current='';
5558
this.params=[];
56-
}
57-
};
59+
};
60+
returnParseParams;
61+
}());
62+
exports.ParseParams=ParseParams;
63+
;

‎lib/reducers/route/route.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22
varactionTypes_1=require('../../actions/actionTypes');
3-
vardefaultRoute='tutorials';
3+
vardefaultRoute='start';
44
functionrouteReducer(route,action){
55
if(route===void0){route=defaultRoute;}
66
switch(action.type){

‎lib/reducers/tutorials/update-tutorial.js

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,6 @@
22
varcommand_line_1=require('../../services/command-line');
33
varstore_1=require('../../store/store');
44
varactions_1=require('../../actions/actions');
5-
functioncanUpdateTutorial(name,currentVersion){
6-
return(command_line_1.default('npm',"outdated "+name)
7-
.then(function(res){
8-
if(res.length>0){
9-
varmatch=res.match(/[0-9\.]+\s+[0-9\.]+\s+([0-9\.]+)/);
10-
if(match.length>=2){
11-
returnmatch[1];
12-
}
13-
}
14-
returnnull;
15-
}));
16-
}
17-
exports.canUpdateTutorial=canUpdateTutorial;
185
functionupdateTutorial(name){
196
command_line_1.default('npm',"install --save-dev "+name)
207
.then(function(){

‎lib/services/exists.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
"use strict";
2-
varfs=require('fs');
2+
varfs_1=require('fs');
33
functionfileExists(pathToFile){
44
try{
5-
fs.accessSync(pathToFile,fs.F_OK);
5+
fs_1.accessSync(pathToFile,fs_1.F_OK);
66
}
77
catch(e){
88
if(e){

‎lib/services/package.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,25 @@ var PackageService = (function () {
2525
project:{},
2626
chapters:[]
2727
};
28-
this.config={};
28+
this.packageJson=null;
2929
}
3030
PackageService.prototype.selectPackage=function(packageName){
3131
varpackagePath=path_1.join(window.coderoad.dir,'node_modules',packageName);
32-
this.config=require(path_1.join(packagePath,'package.json'));
33-
store_1.store.dispatch(actions_1.setGlobals(this.config));
34-
this.data=require(path_1.join(packagePath,this.config.main));
32+
this.packageJson=require(path_1.join(packagePath,'package.json'));
33+
store_1.store.dispatch(actions_1.setGlobals(this.packageJson));
34+
this.data=require(path_1.join(packagePath,this.packageJson.main));
3535
this.packageName=packageName;
3636
};
3737
PackageService.prototype.page=function(_a){
3838
varchapter=_a.chapter,page=_a.page;
3939
returncloneDeep(this.data.chapters[chapter].pages[page]);
4040
};
41-
PackageService.prototype.getConfig=function(){
42-
returnthis.config;
41+
PackageService.prototype.getPackage=function(){
42+
returnthis.packageJson;
4343
};
4444
PackageService.prototype.configTaskTests=function(tasks){
4545
var_this=this;
46-
varconfig=this.config.config;
46+
varconfig=this.packageJson.config;
4747
return!tasks ?[] :tasks.map(function(task){
4848
if(task.tests){
4949
task.tests=task.tests.map(function(test){

‎src/reducers/checks/action-setup.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import*aspathfrom'path';
1+
import{join}from'path';
22
import{open,set}from'../../atom/editor';
33
import{openFolder,openTerminal}from'../../atom/actions';
44
importcommandLinefrom'../../services/command-line';
@@ -13,7 +13,7 @@ const packageData = `{
1313
}`;
1414

1515
exportfunctioncreatePackageJson():Promise<void>{
16-
constpackagePath=path.join(window.coderoad.dir,'package.json');
16+
constpackagePath=join(window.coderoad.dir,'package.json');
1717
returnnewPromise((resolve,reject)=>{
1818
open(packagePath);
1919
setTimeout(function(){

‎src/reducers/editor-actions/action-helpers.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import{parseParams}from'./parser';
1+
import{ParseParams}from'./parser';
22

33
exportfunctiongetCommand(actionString:string):string{
44
// content before bracket
@@ -12,13 +12,14 @@ export function getCommand(actionString: string): string {
1212

1313
exportfunctiongetParams(actionString:string):string[]{
1414
// content in brackets, split by comma
15+
letparser=newParseParams;
1516
letcommand=getCommand(actionString);
1617
letparams=actionString.substring(command.length+1,actionString.length-1);// trim brackets
1718
if(!params.length){
1819
console.error('Error loading editor action params ',actionString);
1920
returnnull;
2021
}
21-
letparamsList:string[]=parseParams.getParams(params);
22+
letparamsList:string[]=parser.getParams(params);
2223
returnparamsList;
2324
}
2425

‎src/reducers/editor-actions/actions.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import*asEditorfrom'../../atom/editor';
1+
import{open,set,insert}from'../../atom/editor';
22
import{openDevTools}from'../../atom/actions';
33
import{getCommand,getParams,getOptions}from'./action-helpers';
44

@@ -19,7 +19,7 @@ export function editorActions(actionString: string): Promise<void> {
1919
letfile=obj.param;
2020
letoptions=obj.options;
2121
if(params.length===1){
22-
Editor.open(file,options);
22+
open(file,options);
2323
setTimeout(function(){
2424
resolve();
2525
},100);
@@ -30,7 +30,7 @@ export function editorActions(actionString: string): Promise<void> {
3030
letcontent=params[0];
3131

3232
setTimeout(function(){
33-
Editor.set(content);
33+
set(content);
3434
resolve(true);
3535
});
3636
}
@@ -41,7 +41,7 @@ export function editorActions(actionString: string): Promise<void> {
4141
letcontent:string=params[0];
4242
// let options: object = obj.options;
4343
setTimeout(function(){
44-
Editor.insert(content,{});
44+
insert(content,{});
4545
resolve(true);
4646
});
4747
}

‎src/reducers/editor-actions/editor-actions.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import*asTypefrom'../../actions/actionTypes';
1+
import{SET_PAGE,TEST_RESULT}from'../../actions/actionTypes';
22
const{times}=require('lodash');
33
import{editorActions}from'./actions';
44

@@ -16,12 +16,12 @@ var actions;
1616
*/
1717
exportdefaultfunctioneditorActionsReducer(editorActions=[],action:CR.Action):string[]{
1818
switch(action.type){
19-
caseType.SET_PAGE:
19+
caseSET_PAGE:
2020
actions=action.payload.actions;
2121
currentTaskPosition=0;
2222
handleEditorActions(actions.shift());
2323
returnactions;
24-
caseType.TEST_RESULT:
24+
caseTEST_RESULT:
2525
actions=action.payload.actions;
2626
letnextTaskPosition=action.payload.result.taskPosition;
2727
if(nextTaskPosition>currentTaskPosition){

‎src/reducers/editor-actions/parser.ts

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
1-
exportconstparseParams={
1+
exportclassParseParams{
2+
round:number;
3+
square:number;
4+
curly:number;
5+
current:string;
6+
params:string[];
7+
constructor(){
8+
this.reset();
9+
}
210
trim(text:string):string{
311
text=text.trim();
412
varfirstBracket=text.charAt(0).match(/["']/);
513
if(firstBracket&&!!text.charAt(text.length-1).match(firstBracket[0])){
614
text=text.substring(1,text.length-1);// trim quotes
715
}
816
returntext;
9-
},
17+
}
1018
addBreak(char:string,index:number):void{
1119
switch(char){
1220
case'(':
@@ -37,14 +45,14 @@ export const parseParams = {
3745
}else{
3846
this.current+=char;
3947
}
40-
},
48+
}
4149
getParams(text:string):string[]{
4250
this.reset();
4351
for(leti=0;i<text.length;i++){
4452
this.addBreak(text[i],i);
4553
}
4654
returnthis.params.concat(this.trim(this.current));
47-
},
55+
}
4856
reset():void{
4957
this.round=0;
5058
this.square=0;

‎src/reducers/globals/globals.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ const defaultGlobals = {
77
win:null
88
};
99

10-
exportdefaultfunctionglobalReducer(globals=defaultGlobals,action:CR.Action):CR.Coderoad{
10+
exportdefaultfunctionglobalReducer(globals=defaultGlobals,
11+
action:CR.Action):CR.Coderoad{
1112
switch(action.type){
1213
caseSET_GLOBALS:
1314
letcoderoad=Object.assign({},setGlobals(action.payload.packageJson),window.coderoad);

‎src/reducers/globals/set-globals.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export function setGlobals(packageJson: PackageJson): CR.Coderoad {
1616
},window.coderoad);
1717
}
1818

19-
functionloadRunnerDep(packageJson:PackageJson){
19+
functionloadRunnerDep(packageJson:PackageJson):()=>any{
2020
// test runner dir
2121
letflatDep=join(window.coderoad.dir,'node_modules',packageJson.config.testRunner,'package.json');
2222
lettreeDep=join(window.coderoad.dir,'node_modules',

‎src/reducers/hint-position/hint-position.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import {
22
SET_PAGE,TEST_RESULT,SET_HINT_POSITION
33
}from'../../actions/actionTypes';
44

5-
exportdefaultfunctionhintPositionReducer(hintPosition=0,action:CR.Action):number{
5+
exportdefaultfunctionhintPositionReducer(hintPosition=0,
6+
action:CR.Action):number{
67
switch(action.type){
78
caseSET_PAGE:
89
return0;

‎src/reducers/log/log.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ let defaultLog = {
77
open:false
88
};
99

10-
exportdefaultfunctionlogReducer(log=defaultLog,action:CR.Action):CR.Log{
10+
exportdefaultfunctionlogReducer(log=defaultLog,
11+
action:CR.Action):CR.Log{
1112
switch(action.type){
1213
caseTOGGLE_LOG:
1314
return{

‎src/reducers/page/page.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ const defaultPage: CR.Page = {
88
completed:false
99
};
1010

11-
exportdefaultfunctionpageReducer(page=defaultPage,action:CR.Action):CR.Page{
11+
exportdefaultfunctionpageReducer(page=defaultPage,
12+
action:CR.Action):CR.Page{
1213
switch(action.type){
1314
caseSET_PAGE:
1415
returnaction.payload.page;

‎src/reducers/position/position.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ const defaultPosition: CR.Position = {
77
page:0
88
};
99

10-
exportdefaultfunctionpositionReducer(position=defaultPosition,action:CR.Action):CR.Position{
10+
exportdefaultfunctionpositionReducer(position=defaultPosition,
11+
action:CR.Action):CR.Position{
1112
switch(action.type){
1213
caseSET_PAGE:
1314
caseSET_POSITION:

0 commit comments

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