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

Commit84a281b

Browse files
committed
improved error handling for task actions
1 parente6ff45c commit84a281b

File tree

6 files changed

+28
-9
lines changed

6 files changed

+28
-9
lines changed

‎lib/modules/page/task-actions/handle-action-string.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ var Type = {
1010
};
1111
functionhandleActionString(actionString){
1212
returnnewPromise(function(resolve,reject){
13+
if(typeofactionString!=='string'){
14+
reject(actionString);
15+
}
1316
varcommand=parser_1.getCommand(actionString);
1417
varparams=parser_1.getParams(actionString);
1518
switch(command){
@@ -45,7 +48,7 @@ function handleActionString(actionString) {
4548
reject(false);
4649
}
4750
}).catch(function(err){
48-
console.error('Errorwith editor',err);
51+
console.error('Errorhandling action string',err);
4952
});
5053
}
5154
Object.defineProperty(exports,"__esModule",{value:true});

‎lib/modules/page/task-actions/handle-actions.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ function handleTaskActions(actions) {
44
varnext=actions.shift();
55
if(next&&next.length){
66
next.reduce(function(total,curr){
7+
if(!curr||!curr.length){
8+
returntotal;
9+
}
710
returntotal.then(function(){returnhandle_action_string_1.default(curr);});
811
},Promise.resolve());
912
}

‎lib/modules/page/task-actions/parser.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,22 @@ function getCommand(actionString) {
44
varcommand=actionString.substring(0,actionString.indexOf('('));
55
if(!command.length){
66
console.log('Error loading editor action command ',actionString);
7+
return'';
78
}
8-
else{
9-
returncommand;
10-
}
9+
returncommand;
1110
}
1211
exports.getCommand=getCommand;
1312
functiongetParams(actionString){
13+
if(typeofactionString!=='string'){
14+
console.log('Error in tutorial with action command. Expected a string but received ',actionString);
15+
return[];
16+
}
1417
varparser=newparse_params_1.default();
1518
varcommand=getCommand(actionString);
1619
varparams=actionString.substring(command.length+1,actionString.length-1);
1720
if(!params.length){
1821
console.error('Error loading editor action params ',actionString);
19-
returnnull;
22+
return[];
2023
}
2124
varparamsList=parser.getParams(params);
2225
returnparamsList;

‎src/modules/page/task-actions/handle-action-string.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ export default function handleActionString(
1414
actionString:string
1515
):Promise<void>{
1616
returnnewPromise((resolve,reject)=>{
17+
if(typeofactionString!=='string'){
18+
reject(actionString);
19+
}
1720
constcommand:string=getCommand(actionString);
1821
constparams:string[]=getParams(actionString);
1922

@@ -63,6 +66,6 @@ export default function handleActionString(
6366
reject(false);
6467
}
6568
}).catch((err)=>{
66-
console.error('Errorwith editor',err);
69+
console.error('Errorhandling action string',err);
6770
});
6871
}

‎src/modules/page/task-actions/handle-actions.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ export default function handleTaskActions(actions: string[][]): void {
55
if(next&&next.length){
66
// resolve promises in order
77
next.reduce((total:Promise<any>,curr:string)=>{
8+
if(!curr||!curr.length){
9+
returntotal;
10+
}
811
returntotal.then(()=>handleActionString(curr));
912
},Promise.resolve());
1013
}

‎src/modules/page/task-actions/parser.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,23 @@ export function getCommand(actionString: string): string {
55
letcommand=actionString.substring(0,actionString.indexOf('('));
66
if(!command.length){
77
console.log('Error loading editor action command ',actionString);
8-
}else{
9-
returncommand;
8+
return'';
109
}
10+
returncommand;
1111
}
1212

1313
exportfunctiongetParams(actionString:string):string[]{
14+
if(typeofactionString!=='string'){
15+
console.log('Error in tutorial with action command. Expected a string but received ',actionString);
16+
return[];
17+
}
1418
// content in brackets, split by comma
1519
letparser=newParseParams();
1620
letcommand=getCommand(actionString);
1721
letparams=actionString.substring(command.length+1,actionString.length-1);// trim brackets
1822
if(!params.length){
1923
console.error('Error loading editor action params ',actionString);
20-
returnnull;
24+
return[];
2125
}
2226
letparamsList:string[]=parser.getParams(params);
2327
returnparamsList;

0 commit comments

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